Global error handling

1 files changed, 15 insertions, 13 deletions

diff --git a/butler.py b/butler.py
index 00644f5..362213d 100644
--- a/butler.py
+++ b/butler.py
@@ -1,26 +1,28 @@
 import sys
 
-from ausbutler.config import load_config
-from ausbutler.goniec import Goniec
-from ausbutler.interface import Interface
-
-
 def main():
     nowait = 'nowait' not in sys.argv
     args = [arg for arg in sys.argv[1:] if arg != 'nowait']
     if len(args) == 0:
         args = ['calculate', 'generate', 'send']
 
-    i = Interface(load_config('butler'))
+    try:
+        from ausbutler.config import load_config
+        from ausbutler.goniec import Goniec
+        from ausbutler.interface import Interface
+
+        i = Interface(load_config('butler'))
 
-    if 'calculate' in args:
-        i.calculate_all()
+        if 'calculate' in args:
+            i.calculate_all()
 
-    if 'generate' in args:
-        files = i.generate_all()
-        if 'send' in args:
-            client = Goniec(load_config('goniec'))
-            client.send(files)
+        if 'generate' in args:
+            files = i.generate_all()
+            if 'send' in args:
+                client = Goniec(load_config('goniec'))
+                client.send(files)
+    except Exception as e:
+        print str(e)
 
     if nowait:
         raw_input('Press any key to continue...')