diff --git a/NanoVNASaver/SweepWorker.py b/NanoVNASaver/SweepWorker.py
index 4220e0e..6d766c9 100644
--- a/NanoVNASaver/SweepWorker.py
+++ b/NanoVNASaver/SweepWorker.py
@@ -123,6 +123,13 @@ class SweepWorker(QtCore.QRunnable):
 
     @pyqtSlot()
     def run(self):
+        try:
+            self._run()
+        except BaseException as exc:
+            logger.exception("%s", exc)
+            raise exc
+
+    def _run(self):
         logger.info("Initializing SweepWorker")
         self.running = True
         self.percentage = 0
diff --git a/NanoVNASaver/__main__.py b/NanoVNASaver/__main__.py
index 61581e4..19e9a90 100644
--- a/NanoVNASaver/__main__.py
+++ b/NanoVNASaver/__main__.py
@@ -79,8 +79,10 @@ def main():
     app = QtWidgets.QApplication(sys.argv)
     window = NanoVNASaver()
     window.show()
-    app.exec_()
-
+    try:
+        app.exec_()
+    except BaseException as exc:
+        logger.exception("%s", exc)
 
 if __name__ == '__main__':
     main()