diff --git a/src/smbiosmdrv2handler.cpp b/src/smbiosmdrv2handler.cpp
index e782d7c..fa250c6 100644
--- a/src/smbiosmdrv2handler.cpp
+++ b/src/smbiosmdrv2handler.cpp
@@ -304,6 +304,13 @@
             "Error getting DirEnries");
         return ipmi::responseUnspecifiedError();
     }
+    if (std::get<uint8_t>(value) == 0)
+    {
+        phosphor::logging::log<phosphor::logging::level::ERR>(
+            "Error getting directory entries",
+            phosphor::logging::entry("VALUE=%x", std::get<uint8_t>(value)));
+        return ipmi::responseUnspecifiedError();
+    }
     if (dirIndex > std::get<uint8_t>(value))
     {
         return ipmi::responseParmOutOfRange();