diff --git a/gapis/api/vulkan/linux/vulkan_linux.api b/gapis/api/vulkan/linux/vulkan_linux.api
index 2b4598bb6c..a3f307727e 100644
--- a/gapis/api/vulkan/linux/vulkan_linux.api
+++ b/gapis/api/vulkan/linux/vulkan_linux.api
@@ -79,6 +79,7 @@ cmd VkBool32 vkGetPhysicalDeviceXlibPresentationSupportKHR(
     u32              queueFamilyIndex,
     Display*         dpy,
     VisualID         visualID) {
+  if !(physicalDevice in PhysicalDevices) { vkErrorInvalidPhysicalDevice(physicalDevice) }
   return ?
 }
 
@@ -135,6 +136,7 @@ cmd VkBool32 vkGetPhysicalDeviceXcbPresentationSupportKHR(
     u32               queueFamilyIndex,
     xcb_connection_t* connection,
     xcb_visualid_t    visual_id) {
+  if !(physicalDevice in PhysicalDevices) { vkErrorInvalidPhysicalDevice(physicalDevice) }
   return ?
 }
 
@@ -189,6 +191,7 @@ cmd VkBool32 vkGetPhysicalDeviceWaylandPresentationSupportKHR(
     VkPhysicalDevice physicalDevice,
     u32              queueFamilyIndex,
     wl_display*      display) {
+  if !(physicalDevice in PhysicalDevices) { vkErrorInvalidPhysicalDevice(physicalDevice) }
   return ?
 }
 
@@ -243,5 +246,6 @@ cmd VkBool32 vkGetPhysicalDeviceMirPresentationSupportKHR(
     VkPhysicalDevice physicalDevice,
     u32              queueFamilyIndex,
     MirConnection*   connection) {
+  if !(physicalDevice in PhysicalDevices) { vkErrorInvalidPhysicalDevice(physicalDevice) }
   return ?
 }
diff --git a/gapis/api/vulkan/windows/vulkan_windows.api b/gapis/api/vulkan/windows/vulkan_windows.api
index d1c634b4be..74dfa38360 100644
--- a/gapis/api/vulkan/windows/vulkan_windows.api
+++ b/gapis/api/vulkan/windows/vulkan_windows.api
@@ -66,5 +66,6 @@ cmd VkResult vkCreateWin32SurfaceKHR(
 cmd VkBool32 vkGetPhysicalDeviceWin32PresentationSupportKHR(
     VkPhysicalDevice                            physicalDevice,
     u32                                         queueFamilyIndex) {
+    if !(physicalDevice in PhysicalDevices) { vkErrorInvalidPhysicalDevice(physicalDevice) }
     return ?
 }
\ No newline at end of file