diff --git a/renderdoc/driver/vulkan/vk_common.cpp b/renderdoc/driver/vulkan/vk_common.cpp
index a5eb99db9..b7bcb418a 100644
--- a/renderdoc/driver/vulkan/vk_common.cpp
+++ b/renderdoc/driver/vulkan/vk_common.cpp
@@ -302,6 +302,12 @@ void *GPUBuffer::Map(uint32_t *bindoffset, VkDeviceSize usedsize)
 
   mapoffset = offset;
 
+  if(mem == VK_NULL_HANDLE)
+  {
+    RDCERR("Manually reporting failed memory map with no memory");
+    m_pDriver->CheckVkResult(VK_ERROR_MEMORY_MAP_FAILED);
+  }
+
   void *ptr = NULL;
   VkResult vkr = m_pDriver->vkMapMemory(device, mem, offset, size, 0, (void **)&ptr);
   m_pDriver->CheckVkResult(vkr);