diff -r 807ec6498502 -r a0982873d655 tool/main.cpp
--- a/tool/main.cpp	Wed Jul 23 07:29:00 2008 +0000
+++ b/tool/main.cpp	Wed Jul 23 08:06:10 2008 +0000
@@ -251,7 +251,7 @@
         cerr << e.what() << endl << endl;
         displayHelp();
         return 1;
-    } catch (ExecutionFailureException &e) {
+    } catch (CommandException &e) {
         cerr << e.what() << endl;
         return 1;
     } catch (MasterDeviceException &e) {