diff --git a/tool/CommandConfig.cpp b/tool/CommandConfig.cpp
index cab9d162..ade6104f 100644
--- a/tool/CommandConfig.cpp
+++ b/tool/CommandConfig.cpp
@@ -105,6 +105,12 @@ void CommandConfig::execute(MasterDevice &m, const StringVector &args)
 {
     ConfigList configs;
 
+    if (args.size()) {
+        stringstream err;
+        err << "'" << getName() << "' takes no arguments!";
+        throwInvalidUsageException(err);
+    }
+
     m.open(MasterDevice::Read);
     configs = selectedConfigs(m);
 
diff --git a/tool/CommandData.cpp b/tool/CommandData.cpp
index f56fd6df..e63680f2 100644
--- a/tool/CommandData.cpp
+++ b/tool/CommandData.cpp
@@ -68,6 +68,12 @@ void CommandData::execute(MasterDevice &m, const StringVector &args)
 	DomainList domains;
 	DomainList::const_iterator di;
 	
+    if (args.size()) {
+        stringstream err;
+        err << "'" << getName() << "' takes no arguments!";
+        throwInvalidUsageException(err);
+    }
+
     m.open(MasterDevice::Read);
 	domains = selectedDomains(m);
 
diff --git a/tool/CommandDomains.cpp b/tool/CommandDomains.cpp
index f81837d0..14bb6b09 100644
--- a/tool/CommandDomains.cpp
+++ b/tool/CommandDomains.cpp
@@ -94,6 +94,12 @@ void CommandDomains::execute(MasterDevice &m, const StringVector &args)
 	DomainList domains;
 	DomainList::const_iterator di;
 	
+    if (args.size()) {
+        stringstream err;
+        err << "'" << getName() << "' takes no arguments!";
+        throwInvalidUsageException(err);
+    }
+
     m.open(MasterDevice::Read);
 	domains = selectedDomains(m);
 
diff --git a/tool/CommandMaster.cpp b/tool/CommandMaster.cpp
index 9a4d3347..07c4d50a 100644
--- a/tool/CommandMaster.cpp
+++ b/tool/CommandMaster.cpp
@@ -66,6 +66,11 @@ void CommandMaster::execute(MasterDevice &m, const StringVector &args)
     stringstream err;
     unsigned int i;
     
+    if (args.size()) {
+        err << "'" << getName() << "' takes no arguments!";
+        throwInvalidUsageException(err);
+    }
+
     m.open(MasterDevice::Read);
     m.getMaster(&data);
 
diff --git a/tool/CommandPdos.cpp b/tool/CommandPdos.cpp
index 16af6f2a..f9d5e2f9 100644
--- a/tool/CommandPdos.cpp
+++ b/tool/CommandPdos.cpp
@@ -94,6 +94,12 @@ void CommandPdos::execute(MasterDevice &m, const StringVector &args)
     SlaveList::const_iterator si;
     bool showHeader;
     
+    if (args.size()) {
+        stringstream err;
+        err << "'" << getName() << "' takes no arguments!";
+        throwInvalidUsageException(err);
+    }
+
     m.open(MasterDevice::Read);
     slaves = selectedSlaves(m);
     showHeader = slaves.size() > 1;
diff --git a/tool/CommandSdos.cpp b/tool/CommandSdos.cpp
index b71c75a4..f241cd9d 100644
--- a/tool/CommandSdos.cpp
+++ b/tool/CommandSdos.cpp
@@ -85,6 +85,12 @@ void CommandSdos::execute(MasterDevice &m, const StringVector &args)
     SlaveList::const_iterator si;
     bool showHeader;
 
+    if (args.size()) {
+        stringstream err;
+        err << "'" << getName() << "' takes no arguments!";
+        throwInvalidUsageException(err);
+    }
+
     m.open(MasterDevice::Read);
     slaves = selectedSlaves(m);
     showHeader = slaves.size() > 1;
diff --git a/tool/CommandSiiRead.cpp b/tool/CommandSiiRead.cpp
index 5ae14264..1694b75c 100644
--- a/tool/CommandSiiRead.cpp
+++ b/tool/CommandSiiRead.cpp
@@ -83,6 +83,11 @@ void CommandSiiRead::execute(MasterDevice &m, const StringVector &args)
     uint16_t categoryType, categorySize;
     stringstream err;
 
+    if (args.size()) {
+        err << "'" << getName() << "' takes no arguments!";
+        throwInvalidUsageException(err);
+    }
+
     m.open(MasterDevice::Read);
     slaves = selectedSlaves(m);
 
diff --git a/tool/CommandSlaves.cpp b/tool/CommandSlaves.cpp
index 0e61050a..4a473aee 100644
--- a/tool/CommandSlaves.cpp
+++ b/tool/CommandSlaves.cpp
@@ -109,6 +109,12 @@ void CommandSlaves::execute(MasterDevice &m, const StringVector &args)
 {
     SlaveList slaves;
     
+    if (args.size()) {
+        stringstream err;
+        err << "'" << getName() << "' takes no arguments!";
+        throwInvalidUsageException(err);
+    }
+
     m.open(MasterDevice::Read);
     slaves = selectedSlaves(m);
 
diff --git a/tool/CommandVersion.cpp b/tool/CommandVersion.cpp
index c48fa475..ab692942 100644
--- a/tool/CommandVersion.cpp
+++ b/tool/CommandVersion.cpp
@@ -56,6 +56,12 @@ string CommandVersion::helpString() const
 
 void CommandVersion::execute(MasterDevice &m, const StringVector &args)
 {
+    if (args.size()) {
+        stringstream err;
+        err << "'" << getName() << "' takes no arguments!";
+        throwInvalidUsageException(err);
+    }
+
     cout << "IgH EtherCAT master " << EC_MASTER_VERSION << endl;
 }
 
diff --git a/tool/CommandXml.cpp b/tool/CommandXml.cpp
index e9008452..34f968e9 100644
--- a/tool/CommandXml.cpp
+++ b/tool/CommandXml.cpp
@@ -73,6 +73,12 @@ void CommandXml::execute(MasterDevice &m, const StringVector &args)
     SlaveList slaves;
     SlaveList::const_iterator si;
 
+    if (args.size()) {
+        stringstream err;
+        err << "'" << getName() << "' takes no arguments!";
+        throwInvalidUsageException(err);
+    }
+
     m.open(MasterDevice::Read);
     slaves = selectedSlaves(m);