--- a/tool/CommandUpload.cpp	Mon Jul 28 08:28:42 2008 +0000
+++ b/tool/CommandUpload.cpp	Mon Jul 28 08:45:28 2008 +0000
@@ -92,8 +92,7 @@
     m.open(MasterDevice::Read);
     slaves = selectedSlaves(m);
     if (slaves.size() != 1) {
-        err << slaves.size() << " slaves selected, single slave required!";
-        throwInvalidUsageException(err);
+        throwSingleSlaveRequired(slaves.size());
     }
     data.slave_position = slaves.front().position;