diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index a6130e7b8..9bcdb38fd 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -691,6 +691,9 @@ meta_compositor_switch_workspace (MetaCompositor     *compositor,
 
   DEBUG_TRACE ("meta_compositor_switch_workspace\n");
 
+  if (!info) /* During startup before manage_screen() */
+    return;
+
   info->switch_workspace_in_progress++;
 
   if (!info->plugin_mgr ||