1 files changed, 2 insertions, 5 deletions
diff --git a/loader/debug_report.c b/loader/debug_report.c
index 637bfd5a..4054d4ed 100644
--- a/loader/debug_report.c
+++ b/loader/debug_report.c
@@ -386,7 +386,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateDebugReportCallback(
 out:
 
     // Roll back on errors
-    if (res != NULL) {
+    if (VK_SUCCESS != res) {
         storage_idx = 0;
         for (icd = inst->icds; icd; icd = icd->next) {
             if (NULL == icd->DestroyDebugReportCallbackEXT) {
@@ -419,12 +419,9 @@ out:
                 free(icd_info);
             }
         }
-
-        return res;
     }
 
-
-    return VK_SUCCESS;
+    return res;
 }
 
 /*