diff --git a/zeronet.py b/zeronet.py
index f56161ee..7e92caa3 100755
--- a/zeronet.py
+++ b/zeronet.py
@@ -45,11 +45,16 @@ def main():
                 handler.close()
                 logger.removeHandler(handler)
 
-
-    except (Exception, ):  # Prevent closing
+    except Exception, err:  # Prevent closing
         import traceback
-        traceback.print_exc()
-        traceback.print_exc(file=open("log/error.log", "a"))
+        try:
+            import logging
+            logging.exception("Unhandled exception: %s" % err)
+        except Exception, log_err:
+            print "Failed to log error:", log_err
+            traceback.print_exc()
+        from Config import config
+        traceback.print_exc(file=open(config.log_dir + "/error.log", "a"))
 
     if main and main.update_after_shutdown:  # Updater
         # Restart
@@ -65,4 +70,4 @@ def main():
         print "Bye."
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()