diff --git a/drmcomposition.cpp b/drmcomposition.cpp
index fad131d..3612972 100644
--- a/drmcomposition.cpp
+++ b/drmcomposition.cpp
@@ -54,11 +54,10 @@
       ALOGE("Failed to allocate new display composition\n");
       return -ENOMEM;
     }
+
+    // If the display hasn't been modeset yet, this will be NULL
     DrmCrtc *crtc = drm_->GetCrtcForDisplay(display);
-    if (!crtc) {
-      ALOGE("Failed to find crtc for display %d", display);
-      return -ENODEV;
-    }
+
     int ret = composition_map_[(*iter)->display()]->Init(drm_, crtc, importer_);
     if (ret) {
       ALOGE("Failed to init display composition for %d", (*iter)->display());
diff --git a/drmdisplaycomposition.cpp b/drmdisplaycomposition.cpp
index c989494..465a318 100644
--- a/drmdisplaycomposition.cpp
+++ b/drmdisplaycomposition.cpp
@@ -102,7 +102,7 @@
 int DrmDisplayComposition::Init(DrmResources *drm, DrmCrtc *crtc,
                                 Importer *importer) {
   drm_ = drm;
-  crtc_ = crtc;
+  crtc_ = crtc; // Can be NULL if we haven't modeset yet
   importer_ = importer;
 
   int ret = hw_get_module(GRALLOC_HARDWARE_MODULE_ID,