diff --git a/gerbview/toolbars_gerber.cpp b/gerbview/toolbars_gerber.cpp
index c995f7fb0f..1913a75e4f 100644
--- a/gerbview/toolbars_gerber.cpp
+++ b/gerbview/toolbars_gerber.cpp
@@ -544,7 +544,8 @@ void GERBVIEW_FRAME::OnUpdateSelectDCode( wxUpdateUIEvent& aEvent )
         m_DCodeSelector->SetDCodeSelection( selected );
         // Be sure the selection can be made. If no, set to
         // a correct value
-        gerber->m_Selected_Tool = m_DCodeSelector->GetSelectedDCodeId();
+        if( gerber )
+            gerber->m_Selected_Tool = m_DCodeSelector->GetSelectedDCodeId();
     }
 }
 
diff --git a/include/worksheet_shape_builder.h b/include/worksheet_shape_builder.h
index be609d9ec3..504d7c3a2a 100644
--- a/include/worksheet_shape_builder.h
+++ b/include/worksheet_shape_builder.h
@@ -395,6 +395,7 @@ public:
         m_penSize = 1;
         m_sheetNumber = 1;
         m_sheetCount = 1;
+        m_sheetLayer = 0;
         m_titleBlock = NULL;
         m_paperFormat = NULL;
         m_sheetFullName = NULL;