Index: /trunk/FACT++/src/drivectrl.cc
===================================================================
--- /trunk/FACT++/src/drivectrl.cc	(revision 10803)
+++ /trunk/FACT++/src/drivectrl.cc	(revision 10804)
@@ -1025,25 +1025,16 @@
     catch (po::multiple_occurrences &e)
     {
-        cout << "Error: " << e.what() << " of '" << e.get_option_name() << "' option." << endl;
-        cout << endl;
+        cerr << "Program options invalid due to: " << e.what() << " of '" << e.get_option_name() << "'." << endl;
         return -1;
     }
 #endif
-    catch (std::exception &e)
-    {
-        cout << "Error: " << e.what() << endl;
-        cout << endl;
-
+    catch (exception& e)
+    {
+        cerr << "Program options invalid due to: " << e.what() << endl;
         return -1;
     }
 
-    if (conf.HasPrint())
+    if (conf.HasVersion() || conf.HasPrint())
         return -1;
-
-    if (conf.HasVersion())
-    {
-        FACT::PrintVersion(argv[0]);
-        return -1;
-    }
 
     if (conf.HasHelp())
Index: /trunk/FACT++/src/fitsloader.cc
===================================================================
--- /trunk/FACT++/src/fitsloader.cc	(revision 10803)
+++ /trunk/FACT++/src/fitsloader.cc	(revision 10804)
@@ -22,5 +22,4 @@
  */
  //****************************************************************
-#include "FACT.h"
 #include "Event.h"
 #include "StateMachineDim.h"
@@ -681,18 +680,19 @@
         vm = conf.Parse(argc, argv);
     }
+#if BOOST_VERSION > 104000
+    catch (po::multiple_occurrences &e)
+    {
+        cerr << "Program options invalid due to: " << e.what() << " of '" << e.get_option_name() << "'." << endl;
+        return -1;
+    }
+#endif
     catch (exception& e)
     {
-        cout << "Sorry, could not properly parse the program's arguments. returning" << endl;
-        cout << e.what() << endl;
+        cerr << "Program options invalid due to: " << e.what() << endl;
         return -1;
     }
 
-    if (conf.HasPrint())
-            return -1;
-    if (conf.HasVersion())
-    {
-        FACT::PrintVersion(argv[0]);
+    if (conf.HasVersion() || conf.HasPrint())
         return -1;
-    }
 
     if (conf.HasHelp())
