diff --git a/cvpcb/cvpcb_mainframe.cpp b/cvpcb/cvpcb_mainframe.cpp
index 19b4806007..126c3e0fec 100644
--- a/cvpcb/cvpcb_mainframe.cpp
+++ b/cvpcb/cvpcb_mainframe.cpp
@@ -816,7 +816,8 @@ void CVPCB_MAINFRAME::CreateScreenCmp()
         fpframe->Raise();   // Make sure that is visible.
         Raise();            // .. but still we want the focus.
 
-        focus->SetFocus();
+        if( focus )
+            focus->SetFocus();
     }
 
     fpframe->InitDisplay();