diff --git a/common/embedded_files.cpp b/common/embedded_files.cpp
index 9c8afe65dc..92ef040517 100644
--- a/common/embedded_files.cpp
+++ b/common/embedded_files.cpp
@@ -390,8 +390,10 @@ void EMBEDDED_FILES_PARSER::ParseEmbedded( EMBEDDED_FILES* aFiles )
                 catch( const PARSE_ERROR& e )
                 {
                     // No data in the file -- due to bug in writer for 9.0.0
-                    NeedRIGHT();
-                    break;
+                    if( curTok == T_RIGHT )
+                        break;
+                    else
+                        throw e;
                 }
                 catch( ... )
                 {