diff --git a/src/core/screen.c b/src/core/screen.c
index 7e8c58100..b5cc1f778 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -1185,6 +1185,9 @@ meta_screen_remove_workspace (MetaScreen *screen, MetaWorkspace *workspace,
       l = l->next;
     }
 
+  if (!neighbour)
+    return;
+
   meta_workspace_relocate_windows (workspace, neighbour);
 
   if (workspace == screen->active_workspace)