Index: /trunk/src/VBox/Main/xml/Settings.cpp
===================================================================
--- /trunk/src/VBox/Main/xml/Settings.cpp	(revision 51211)
+++ /trunk/src/VBox/Main/xml/Settings.cpp	(revision 51212)
@@ -5498,5 +5498,5 @@
                         fNonStdName = true;
                     break;
-               case USBControllerType_EHCI:
+                case USBControllerType_EHCI:
                     cEhciCtrls++;
                     if (ctrl.strName != "EHCI")
@@ -5504,5 +5504,6 @@
                     break;
                 default:
-                    AssertMsgFailed(("Unknown USB controller type %d\n", ctrl.enmType));
+                    /* Anything unknown forces a bump. */
+                    fNonStdName = true;
             }