diff --git a/common/core/overlaylayer.cpp b/common/core/overlaylayer.cpp
index e8e65195..f2a29cff 100644
--- a/common/core/overlaylayer.cpp
+++ b/common/core/overlaylayer.cpp
@@ -416,8 +416,8 @@ void OverlayLayer::ValidatePreviousFrameState(OverlayLayer* rhs,
     if (!rhs->imported_buffer_.get()) {
       state_ |= kNeedsReValidation;
       return;
-    } else if (buffer->GetFormat() !=
-               rhs->imported_buffer_->buffer_->GetFormat()) {
+    } else if (buffer && (buffer->GetFormat() !=
+                          rhs->imported_buffer_->buffer_->GetFormat())) {
       state_ |= kNeedsReValidation;
       return;
     }
diff --git a/wsi/drm/drmdisplay.cpp b/wsi/drm/drmdisplay.cpp
index 961d91d0..24c12409 100644
--- a/wsi/drm/drmdisplay.cpp
+++ b/wsi/drm/drmdisplay.cpp
@@ -132,6 +132,10 @@ void DrmDisplay::DrmConnectorGetDCIP3Support(
   }
 
   edid = (uint8_t *)blob->data;
+  if (!edid) {
+    return;
+  }
+
   blocks = FindExtendedBlocksForTag(edid, CTA_EXTENDED_TAG_CODE);
 
   for (uint8_t *ext_block : blocks) {