diff --git a/libdmabufheap/src/dmabuf_alloc.c b/libdmabufheap/src/dmabuf_alloc.c
index 3db38512e700fc6ee8ac0487311f5563fdbaff2b..6d759f9ee7e624a5abd1fa84197ca2578f77f87e 100644
--- a/libdmabufheap/src/dmabuf_alloc.c
+++ b/libdmabufheap/src/dmabuf_alloc.c
@@ -32,12 +32,13 @@
 
 static bool IsHeapNameValid(const char *heapName)
 {
+    if (heapName == NULL) {
+        return false;
+    }
     size_t len = strlen(heapName);
-    if ((heapName == NULL) || (len == 0) ||
-        (len > HEAP_NAME_MAX_LEN)) {
+    if ((len == 0) || (len > HEAP_NAME_MAX_LEN)) {
         return false;
     }
-
     return true;
 }