diff --git a/src/backends/meta-cursor.c b/src/backends/meta-cursor.c
index d888c3ee3..0be397695 100644
--- a/src/backends/meta-cursor.c
+++ b/src/backends/meta-cursor.c
@@ -313,7 +313,7 @@ load_cursor_image (MetaCursorReference *cursor)
       cursor->current_frame = 0;
       cursor->xcursor_images = load_cursor_on_client (cursor->cursor);
       if (!cursor->xcursor_images)
-        return;
+        meta_fatal ("Could not find cursor. Perhaps set XCURSOR_PATH?");
     }
 
   image = meta_cursor_reference_get_current_frame_image (cursor);
diff --git a/src/core/screen.c b/src/core/screen.c
index 5fb498075..4a95de627 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -1265,9 +1265,6 @@ meta_screen_update_cursor (MetaScreen *screen)
   MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (screen);
 
   cursor_ref = meta_cursor_reference_from_theme (cursor);
-  if (cursor_ref == NULL)
-    meta_fatal ("Could not find cursor. Perhaps set XCURSOR_PATH?");
-
   meta_cursor_tracker_set_root_cursor (tracker, cursor_ref);
   meta_cursor_reference_unref (cursor_ref);