1 files changed, 15 insertions, 1 deletions
diff --git a/obnam b/obnam
index 59ccd3a3..aaf5b23f 100755
--- a/obnam
+++ b/obnam
@@ -15,5 +15,19 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+import logging
+import sys
+import traceback
+
 import obnamlib
-obnamlib.App().run()
+try:
+    obnamlib.App().run()
+except obnamlib.AppException, e:
+    logging.critical(str(e))
+    sys.stderr.write('Error: %s\n' % str(e))
+    sys.exit(1)
+except BaseException, e:
+    logging.critical(traceback.format_exc())
+    sys.stderr.write(traceback.format_exc())
+    sys.exit(1)
+