From 3cd752417b6e4bab12e7281e596daa389af23f68 Mon Sep 17 00:00:00 2001
From: Ian Rees <ian.rees@gmail.com>
Date: Sat, 26 Mar 2016 20:49:47 +1300
Subject: [PATCH] Catch exceptions in FreeCADCmd like FreeCAD

---
 src/Main/MainCmd.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Main/MainCmd.cpp b/src/Main/MainCmd.cpp
index 03ce38757..3c3a9376c 100644
--- a/src/Main/MainCmd.cpp
+++ b/src/Main/MainCmd.cpp
@@ -122,8 +122,18 @@ int main( int argc, char ** argv )
     }
 
     // Run phase ===========================================================
-    Application::runApplication();
-
+    try {
+        Application::runApplication();
+    }
+    catch (const Base::SystemExitException&) {
+        exit(0);
+    }
+    catch (const Base::Exception& e) {
+        e.ReportException();
+    }
+    catch (...) {
+        Console().Error("Application unexpectedly terminated\n");
+    }
 
     // Destruction phase ===========================================================
     Console().Log("FreeCAD terminating...\n");