diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
index fd4a86b..d5cc3c2 100644
--- a/VulkanHppGenerator.cpp
+++ b/VulkanHppGenerator.cpp
@@ -1415,6 +1415,18 @@ bool VulkanHppGenerator::containsUnion(std::string const& type, std::map<std::st
   return found;
 }
 
+void VulkanHppGenerator::checkCorrectness()
+{
+  for (auto command : m_commands)
+  {
+    // check that functions returning a VkResult specify successcodes
+    if ((command.second.unchangedReturnType == "VkResult") && command.second.successCodes.empty())
+    {
+      throw std::runtime_error("Spec error on command Vk" + startUpperCase(command.first) + " : missing successcodes on command returning VkResult!");
+    }
+  }
+}
+
 std::map<std::string, std::string> VulkanHppGenerator::createDefaults()
 {
   std::map<std::string, std::string> defaultValues;
@@ -5219,6 +5231,7 @@ int main( int argc, char **argv )
       }
     }
 
+    generator.checkCorrectness();
     generator.sortDependencies();
 
 #if !defined(NDEBUG)
diff --git a/VulkanHppGenerator.hpp b/VulkanHppGenerator.hpp
index b6f9d7b..381ffd2 100644
--- a/VulkanHppGenerator.hpp
+++ b/VulkanHppGenerator.hpp
@@ -30,6 +30,7 @@ class VulkanHppGenerator
       m_handles.insert(std::make_pair("", HandleData()));   // insert the default "handle" without class (for createInstance, and such)
     }
 
+    void checkCorrectness();
     std::map<std::string, std::string> createDefaults();
     std::string const& getTypesafeCheck() const;
     std::string const& getVersion() const;