diff --git a/src/detail/auv2/build-helper/build-helper.cpp b/src/detail/auv2/build-helper/build-helper.cpp
index a7267f33..9b99e7db 100644
--- a/src/detail/auv2/build-helper/build-helper.cpp
+++ b/src/detail/auv2/build-helper/build-helper.cpp
@@ -331,14 +331,21 @@ int main(int argc, char **argv)
         {
           cppf << "AUV2_Type::aumu_musicdevice";
         }
-        if (u.type == "aumi")
+        else if (u.type == "aumi")
         {
           cppf << "AUV2_Type::aumi_noteeffect";
         }
-        if (u.type == "aufx")
+        else if (u.type == "aufx")
         {
           cppf << "AUV2_Type::aufx_effect";
         }
+        else
+        {
+          std::cout << "    + WARNING: Unable to determine AUV2_Type for instrument type '" << u.type
+                    << "'\n"
+                    << "      Defaulting to AUV2_Type::musicdevice" << std::endl;
+          cppf << "AUV2_Type::aumu_musicdevice";
+        }
         cppf << "," << args << ", ci) {}"
              << "};\n"
              << "AUSDK_COMPONENT_ENTRY(ausdk::AUMusicDeviceFactory, " << on << ");\n";