diff --git a/common/eda_base_frame.cpp b/common/eda_base_frame.cpp
index 05863e1ce7..fcb33235dd 100644
--- a/common/eda_base_frame.cpp
+++ b/common/eda_base_frame.cpp
@@ -393,7 +393,8 @@ void EDA_BASE_FRAME::ShowChangedLanguage()
 
 void EDA_BASE_FRAME::CommonSettingsChanged( bool aEnvVarsChanged )
 {
-    GetToolManager()->GetActionManager()->UpdateHotKeys( false );
+    if( GetToolManager() )
+        GetToolManager()->GetActionManager()->UpdateHotKeys( false );
 
     if( GetMenuBar() )
     {