--- a/PalantirServer/main.cpp	Tue Aug 28 11:20:49 2012 +0200
+++ b/PalantirServer/main.cpp	Tue Aug 28 15:10:02 2012 +0200
@@ -95,18 +95,17 @@
 
 int main(int argc, char* argv[]) 
 {
-  if (argc >= 2)
-  {
-    PalantirInitialize(argv[1]);
-  }
-  else
-  {
-    PalantirInitialize();
-  }
-
-
   try
   {
+    if (argc >= 2)
+    {
+      PalantirInitialize(argv[1]);
+    }
+    else
+    {
+      PalantirInitialize();
+    }
+
     std::string storageDirectory = GetGlobalStringParameter("StorageDirectory", "PalantirStorage");
     ServerIndex index(storageDirectory);
     MyDicomStoreFactory storeScp(index, storageDirectory);
@@ -157,13 +156,13 @@
     }
 
     storeScp.Done();
+
+    PalantirFinalize();
   }
   catch (PalantirException& e)
   {
     std::cout << "EXCEPT [" << e.What() << "]" << std::endl;
   }
 
-  PalantirFinalize();
-
   return 0;
 }