Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	(revision 52036)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	(revision 52037)
@@ -165,4 +165,5 @@
                      "                            [--name <name>]\n"
                      "                            [--groups <group>, ...]\n"
+                     "                            [--description <desc>]\n"
                      "                            [--ostype <ostype>]\n"
                      "                            [--iconfile <filename>]\n"
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp	(revision 52036)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp	(revision 52037)
@@ -1074,4 +1074,5 @@
                         engine->GetNetworkSettings(&mtu, &sockSnd, &sockRcv, &tcpSnd, &tcpRcv);
 
+/** @todo r=klaus dnsproxy etc needs to be dumped, too */
                         if (details == VMINFO_MACHINEREADABLE)
                         {
@@ -1753,5 +1754,5 @@
                         currentPort = -1; /* VM not powered up */
                     }
-                    if (FAILED(rc))
+                    else if (FAILED(rc))
                     {
                         com::ErrorInfo info(vrdeServerInfo, COM_IIDOF(IVRDEServerInfo));