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