diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java
index bb9d89251a..bebcffb4e3 100644
--- a/src/com/android/launcher3/util/DisplayController.java
+++ b/src/com/android/launcher3/util/DisplayController.java
@@ -168,7 +168,10 @@ public class DisplayController implements DesktopVisibilityListener {
                     new DisplayManager.DisplayListener() {
                         @Override
                         public void onDisplayAdded(int displayId) {
-                            getOrCreatePerDisplayInfo(displayManager.getDisplay(displayId));
+                            Display display = displayManager.getDisplay(displayId);
+                            if (display != null) {
+                                getOrCreatePerDisplayInfo(display);
+                            }
                         }
 
                         @Override