diff --git a/src/vulkan/runtime/vk_object.h b/src/vulkan/runtime/vk_object.h
index c94c7050215..72a7831d56c 100644
--- a/src/vulkan/runtime/vk_object.h
+++ b/src/vulkan/runtime/vk_object.h
@@ -161,9 +161,10 @@ vk_object_base_from_u64_handle(uint64_t handle, VkObjectType obj_type)
    static inline __VkType                                                  \
    __driver_type ## _to_handle(struct __driver_type *_obj)                 \
    {                                                                       \
-      vk_object_base_assert_valid(&_obj->__base, __VK_TYPE);               \
-      if (_obj != NULL)                                                    \
+      if (_obj != NULL) {                                                  \
+         vk_object_base_assert_valid(&_obj->__base, __VK_TYPE);            \
          _obj->__base.client_visible = true;                               \
+      }                                                                    \
       return (__VkType) _obj;                                              \
    }
 
@@ -201,9 +202,10 @@ vk_object_base_from_u64_handle(uint64_t handle, VkObjectType obj_type)
    UNUSED static inline __VkType                                           \
    __driver_type ## _to_handle(struct __driver_type *_obj)                 \
    {                                                                       \
-      vk_object_base_assert_valid(&_obj->__base, __VK_TYPE);               \
-      if (_obj != NULL)                                                    \
+      if (_obj != NULL) {                                                  \
+         vk_object_base_assert_valid(&_obj->__base, __VK_TYPE);            \
          _obj->__base.client_visible = true;                               \
+      }                                                                    \
       return (__VkType)(uintptr_t) _obj;                                   \
    }