--- a/PalantirServer/PalantirInitialization.cpp	Tue Jul 24 10:03:17 2012 +0200
+++ b/PalantirServer/PalantirInitialization.cpp	Tue Jul 24 10:17:12 2012 +0200
@@ -48,14 +48,22 @@
     }
     else
     {
-#if PALANTIR_RELEASE == 0
-      boost::filesystem::path p = PALANTIR_PATH;
-      p /= "Resources";
-      p /= CONFIGURATION_FILE;
-      Toolbox::ReadFile(content, p.string());
+      try
+      {
+#if PALANTIR_STANDALONE == 0
+        boost::filesystem::path p = PALANTIR_PATH;
+        p /= "Resources";
+        p /= CONFIGURATION_FILE;
+        Toolbox::ReadFile(content, p.string());
 #else
-      Toolbox::ReadFile(content, CONFIGURATION_FILE);
+        Toolbox::ReadFile(content, CONFIGURATION_FILE);
 #endif
+      }
+      catch (PalantirException&)
+      {
+        // No configuration file found, give up with empty configuration
+        return;
+      }
     }
 
     Json::Reader reader;