3 files changed, 22 insertions, 4 deletions
diff --git a/cpp/CHANGES b/cpp/CHANGES
index 0704b9debdf..1c519d96da9 100644
--- a/cpp/CHANGES
+++ b/cpp/CHANGES
@@ -1,6 +1,9 @@
 Changes since version 1.2.0
 ---------------------------
 
+- The glacierrouter and glacierstarter processes used to abort if
+  given a non-existent config file.
+
 - Changed Ice::Exception::ice_name() to return const std::string&
   instead of returning a string by value.
 
diff --git a/cpp/src/Glacier/GlacierRouter.cpp b/cpp/src/Glacier/GlacierRouter.cpp
index 2691d79026e..8a9a25c3467 100644
--- a/cpp/src/Glacier/GlacierRouter.cpp
+++ b/cpp/src/Glacier/GlacierRouter.cpp
@@ -295,8 +295,15 @@ main(int argc, char* argv[])
     //
     // Make sure that this process doesn't use a router.
     //
-    PropertiesPtr defaultProperties = getDefaultProperties(argc, argv);
-    defaultProperties->setProperty("Ice.Default.Router", "");
+    try {
+	PropertiesPtr defaultProperties = getDefaultProperties(argc, argv);
+	defaultProperties->setProperty("Ice.Default.Router", "");
+    }
+    catch(const Ice::Exception& e)
+    {
+	cerr << e << endl;
+	exit(EXIT_FAILURE);
+    }
 
     Glacier::RouterApp app;
     return app.main(argc, argv);
diff --git a/cpp/src/Glacier/GlacierStarter.cpp b/cpp/src/Glacier/GlacierStarter.cpp
index a00e8f88bb9..db2d2d1503e 100644
--- a/cpp/src/Glacier/GlacierStarter.cpp
+++ b/cpp/src/Glacier/GlacierStarter.cpp
@@ -197,8 +197,16 @@ main(int argc, char* argv[])
     //
     // Make sure that this process doesn't use a router.
     //
-    PropertiesPtr defaultProperties = getDefaultProperties(argc, argv);
-    defaultProperties->setProperty("Ice.Default.Router", "");
+    try
+    {
+	PropertiesPtr defaultProperties = getDefaultProperties(argc, argv);
+	defaultProperties->setProperty("Ice.Default.Router", "");
+    }
+    catch(const Ice::Exception& e)
+    {
+	cerr << e << endl;
+	exit(EXIT_FAILURE);
+    }
 
     Glacier::RouterApp app;
     return app.main(argc, argv);