1 files changed, 7 insertions, 0 deletions
diff --git a/cpp/demo/IceStorm/clock/Publisher.cpp b/cpp/demo/IceStorm/clock/Publisher.cpp
index 3ebe93ed502..bebf2b72b76 100644
--- a/cpp/demo/IceStorm/clock/Publisher.cpp
+++ b/cpp/demo/IceStorm/clock/Publisher.cpp
@@ -52,6 +52,13 @@ Publisher::run(int argc, char* argv[])
     catch(const IceUtil::BadOptException& e)
     {
         cerr << argv[0] << ": " << e.reason << endl;
+        usage(appName());
+        return EXIT_FAILURE;
+    }
+    if(remaining.size() > 1)
+    {
+        cerr << appName() << ": too many arguments" << endl;
+        usage(appName());
         return EXIT_FAILURE;
     }