From 910cafe72e00ab05f8aae041f5ee7d9eeda1c257 Mon Sep 17 00:00:00 2001
From: Chris Pavlina <pavlina.chris@gmail.com>
Date: Tue, 16 Aug 2016 22:02:05 -0400
Subject: [PATCH] FUTURE_FORMAT_ERROR: don't nest errors unnecessarily

---
 pcbnew/kicad_plugin.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pcbnew/kicad_plugin.cpp b/pcbnew/kicad_plugin.cpp
index d73e10783c..99c44f0215 100644
--- a/pcbnew/kicad_plugin.cpp
+++ b/pcbnew/kicad_plugin.cpp
@@ -1740,6 +1740,11 @@ BOARD* PCB_IO::Load( const wxString& aFileName, BOARD* aAppendToMe, const PROPER
     {
         board = dynamic_cast<BOARD*>( m_parser->Parse() );
     }
+    catch( const FUTURE_FORMAT_ERROR& parse_error )
+    {
+        // Don't wrap a FUTURE_FORMAT_ERROR in another
+        throw;
+    }
     catch( const PARSE_ERROR& parse_error )
     {
         if( m_parser->IsTooRecent() )