diff --git a/cmake/enable_sdks.cmake b/cmake/enable_sdks.cmake
index 517545d8..5a2e1f08 100644
--- a/cmake/enable_sdks.cmake
+++ b/cmake/enable_sdks.cmake
@@ -481,6 +481,11 @@ if (APPLE)
 				message(FATAL_ERROR "clap-wrapper: For now please specify AUV2 manufacturer code (4 chars)")
 			endif()
 
+			if (NOT DEFINED AUV2_BUNDLE_VERSION)
+				message(WARNING "clap-wrapper: bundle version not defined. Chosing 1")
+				set(AUV2_BUNDLE_VERSION 1)
+			endif()
+
 			# We need a build helper which ejects our config code for info-plist and entry points
 			set(bhtg ${AUV2_TARGET}-build-helper)
 			set(bhsc "${CLAP_WRAPPER_CMAKE_CURRENT_SOURCE_DIR}/src/detail/auv2/build-helper/")
diff --git a/src/detail/auv2/build-helper/build-helper.cpp b/src/detail/auv2/build-helper/build-helper.cpp
index f83207ab..988abb9e 100644
--- a/src/detail/auv2/build-helper/build-helper.cpp
+++ b/src/detail/auv2/build-helper/build-helper.cpp
@@ -115,6 +115,11 @@ int main(int argc, char **argv)
     std::vector<auInfo> units;
     if (std::string(argv[1]) == "--explicit")
     {
+        if (argc != 8)
+        {
+            std::cout << "[ERROR] Configuration incorrect. Got " << argc << " arguments in explicit" << std::endl;
+            return 5;
+        }
         int idx = 2;
         auInfo u;
         u.name = std::string(argv[idx++]);
@@ -130,6 +135,11 @@ int main(int argc, char **argv)
     }
     else if (std::string(argv[1]) == "--fromclap")
     {
+        if (argc != 5)
+        {
+            std::cout << "[ERROR] Configuration incorrect. Got " << argc << " arguments in fromclap" << std::endl;
+            return 5;
+        }
         int idx = 2;
         auto clapfile = std::string(argv[idx++]);
         auto mcode = std::string(argv[idx++]);