diff -r 807ec6498502 -r a0982873d655 tool/cmd_debug.cpp
--- a/tool/cmd_debug.cpp	Wed Jul 23 07:29:00 2008 +0000
+++ b/tool/cmd_debug.cpp	Wed Jul 23 08:06:10 2008 +0000
@@ -36,8 +36,8 @@
     
     if (commandArgs.size() != 1) {
         stringstream err;
-        err << "'debug' takes exactly one argument!";
-        throw MasterDeviceException(err.str());
+        err << "'" << commandName << "' takes exactly one argument!";
+        throw InvalidUsageException(err);
     }
 
     str << commandArgs[0];
@@ -47,7 +47,7 @@
     if (str.fail()) {
         stringstream err;
         err << "Invalid debug level '" << commandArgs[0] << "'!";
-        throw MasterDeviceException(err.str());
+        throw InvalidUsageException(err);
     }
 
     masterDev.open(MasterDevice::ReadWrite);