diff --git a/platform.cpp b/platform.cpp
index 9e0eb45..b7a47c7 100644
--- a/platform.cpp
+++ b/platform.cpp
@@ -118,8 +118,10 @@
 
     ret = Emplace(composition, planes, DrmCompositionPlane::Type::kLayer, crtc,
                   std::make_pair(i->first, i->second));
-    if (ret)
+    if (ret) {
       ALOGE("Failed to dedicate protected layer! Dropping it.");
+      return ret;
+    }
 
     protected_zorder = i->first;
     i = layers.erase(i);
@@ -139,8 +141,10 @@
     // We don't have any planes left
     if (ret == -ENOENT)
       break;
-    else if (ret)
+    else if (ret) {
       ALOGE("Failed to emplace layer %zu, dropping it", i->first);
+      return ret;
+    }
   }
 
   return 0;
diff --git a/platformhisi.cpp b/platformhisi.cpp
index 0e12ef1..bf4033b 100644
--- a/platformhisi.cpp
+++ b/platformhisi.cpp
@@ -158,8 +158,10 @@
       // We don't have any planes left
       if (ret == -ENOENT)
         break;
-      else if (ret)
+      else if (ret) {
         ALOGE("Failed to emplace layer %zu, dropping it", i->first);
+        return ret;
+      }
     }
     /*
      * If we only have one layer, but we didn't emplace anything, we