2 files changed, 17 insertions, 8 deletions
diff --git a/cpp/src/IcePack/ComponentDeployer.cpp b/cpp/src/IcePack/ComponentDeployer.cpp
index 0716c96d709..a19221e899d 100644
--- a/cpp/src/IcePack/ComponentDeployer.cpp
+++ b/cpp/src/IcePack/ComponentDeployer.cpp
@@ -539,7 +539,7 @@ IcePack::ComponentDeployer::addOffer(const string& offer, const string& adapter,
     }
     catch(Ice::LocalException& ex)
     {
-	cerr << "Couldn't contact the yellow service to register the offer '" << offer << "':" << ex << endl;
+	cerr << "Couldn't contact the yellow service to register the offer '" << offer << "':\n" << ex << endl;
 	_error++;
 	return;	
     }
diff --git a/cpp/src/IcePack/Server.cpp b/cpp/src/IcePack/Server.cpp
index 3ef27c001fc..16502266c9c 100644
--- a/cpp/src/IcePack/Server.cpp
+++ b/cpp/src/IcePack/Server.cpp
@@ -77,21 +77,30 @@ main(int argc, char* argv[])
 	return EXIT_FAILURE;
     }
 
+    PropertiesPtr defaultProperties;
+    try
+    {
+	defaultProperties = getDefaultProperties(argc, argv);
+	StringSeq args = argsToStringSeq(argc, argv);
+	args = defaultProperties->parseCommandLineOptions("IcePack", args);
+	stringSeqToArgs(args, argc, argv);
+    }
+    catch(const SystemException& ex)
+    {
+	cerr << argv[0] << ": " << ex << endl;
+	return EXIT_FAILURE;
+    }
+
     //
-    // Get the data directory from the IcePack.Data property.
+    // Check that IcePack.Data property is set and creates
+    // subdirectories db and servers if they don't already exist.
     //
-    PropertiesPtr defaultProperties = getDefaultProperties(argc, argv);
-    StringSeq args = argsToStringSeq(argc, argv);
-    args = defaultProperties->parseCommandLineOptions("IcePack", args);
-    stringSeqToArgs(args, argc, argv);
-
     string dataPath = defaultProperties->getProperty("IcePack.Data");
     if(dataPath.empty())
     {
 	cerr << argv[0] << ": property `IcePack.Data' is not set" << endl;
 	return EXIT_FAILURE;
     }
-    
     if(dataPath[dataPath.length() - 1] != '/')
     {
 	dataPath += "/";