1 files changed, 11 insertions, 2 deletions
diff --git a/cpp/src/IceStorm/Server.cpp b/cpp/src/IceStorm/Server.cpp
index 65d441fb49a..d27e8873a01 100644
--- a/cpp/src/IceStorm/Server.cpp
+++ b/cpp/src/IceStorm/Server.cpp
@@ -37,8 +37,17 @@ public:
 int
 main(int argc, char* argv[])
 {
-    addArgumentPrefix("IceStorm");
-    PropertiesPtr defaultProperties = getDefaultProperties(argc, argv);
+    try
+    {
+	addArgumentPrefix("IceStorm");
+	PropertiesPtr defaultProperties = getDefaultProperties(argc, argv);
+    }
+    catch(const Exception& ex)
+    {
+	cerr << argv[0] << ": " << ex << endl;
+	return EXIT_FAILURE;
+    }
+
     string dbEnvName = defaultProperties->getProperty("IceStorm.DBEnvName");
     if (dbEnvName.empty())
     {