diff --git a/src/com/android/wallpaper/picker/WorkspaceSurfaceHolderCallback.java b/src/com/android/wallpaper/picker/WorkspaceSurfaceHolderCallback.java
index c469820..2661923 100644
--- a/src/com/android/wallpaper/picker/WorkspaceSurfaceHolderCallback.java
+++ b/src/com/android/wallpaper/picker/WorkspaceSurfaceHolderCallback.java
@@ -164,6 +164,12 @@
 
     protected void requestPreview(SurfaceView workspaceSurface,
             PreviewUtils.WorkspacePreviewCallback callback) {
+        if (workspaceSurface.getDisplay() == null) {
+            Log.w(TAG,
+                    "No display ID, avoiding asking for workspace preview, lest WallpaperPicker "
+                            + "crash");
+            return;
+        }
         Bundle request = SurfaceViewUtils.createSurfaceViewRequest(workspaceSurface);
         if (mWallpaperColors != null) {
             request.putParcelable(KEY_WALLPAPER_COLORS, mWallpaperColors);