diff --git a/pcbnew/drc/drc_rule_parser.cpp b/pcbnew/drc/drc_rule_parser.cpp
index 0642b8e145..7ac7de2697 100644
--- a/pcbnew/drc/drc_rule_parser.cpp
+++ b/pcbnew/drc/drc_rule_parser.cpp
@@ -189,7 +189,18 @@ DRC_SELECTOR* DRC_RULES_PARSER::parseDRC_SELECTOR( wxString* aRuleName )
 
         case T_match_layer:
             NeedSYMBOL();
-            selector->m_MatchLayers.push_back( m_layerMap[ curText ] );
+
+            if( m_layerMap.count( curText ) )
+            {
+                selector->m_MatchLayers.push_back( m_layerMap[ curText ] );
+            }
+            else
+            {
+                wxString errText = wxString::Format( _( "Layer \"%s\" not found." ),
+                                                     wxString( curText ) );
+                THROW_PARSE_ERROR( errText, CurSource(), CurLine(), CurLineNumber(), CurOffset() );
+            }
+
             NeedRIGHT();
             break;