Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp	(revision 35114)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp	(revision 35115)
@@ -556,4 +556,15 @@
                 if (!pMedium2Mount)
                     throw Utf8StrFmt("Invalid UUID or filename \"%s\"", pszMedium);
+            }
+
+            // set medium type, if so desired
+            if (pMedium2Mount && mediumType != MediumType_Normal)
+            {
+                CHECK_ERROR(pMedium2Mount, COMSETTER(Type)(mediumType));
+            }
+
+            if (pMedium2Mount && !bstrComment.isEmpty())
+            {
+                CHECK_ERROR(pMedium2Mount, COMSETTER(Description)(bstrComment.raw()));
             }
 
@@ -621,15 +632,4 @@
                 break;
             }
-
-            // set medium type, if so desired
-            if (pMedium2Mount && mediumType != MediumType_Normal)
-            {
-                CHECK_ERROR(pMedium2Mount, COMSETTER(Type)(mediumType));
-            }
-
-            if (!bstrComment.isEmpty())
-            {
-                CHECK_ERROR(pMedium2Mount, COMSETTER(Description)(bstrComment.raw()));
-            }
         }