diff --git a/github b/github
index eb310aa..cca8985 160000
--- a/github
+++ b/github
@@ -1 +1 @@
-Subproject commit eb310aa0eafd254324a6f921f1c055c664bf48cc
+Subproject commit cca898581e4b4138a2b4f99429d0bbd70a344bc4
diff --git a/modules/renderer/context-menu.ts b/modules/renderer/context-menu.ts
index 8c10689..696805d 100644
--- a/modules/renderer/context-menu.ts
+++ b/modules/renderer/context-menu.ts
@@ -18,7 +18,11 @@ class ElectronContextMenu implements contextmenu.ContextMenuProvider {
 
         for(const listener of this._close_listeners) {
             if(listener) {
-                listener();
+                try {
+                    listener();
+                } catch (e) {
+                    console.error("Failed to call context menu close listener: %o", e);
+                }
             }
         }
         this._close_listeners = [];
diff --git a/native/serverconnection/src/connection/Socket.cpp b/native/serverconnection/src/connection/Socket.cpp
index fffa9a7..37aad8b 100644
--- a/native/serverconnection/src/connection/Socket.cpp
+++ b/native/serverconnection/src/connection/Socket.cpp
@@ -89,14 +89,13 @@ void UDPSocket::finalize() {
         if(event_write) event_del_noblock(event_write);
     }
 
-	if(io_base)
-		event_base_loopexit(io_base, nullptr);
+	if(io_base) {
+        event_base_loopexit(io_base, nullptr);
+	}
 
 	if(is_event_thread) {
-        event_base_loopexit(io_base, nullptr);
         this->_io_thread.detach();
 	} else {
-        event_base_loopexit(io_base, nullptr);
         if(this->_io_thread.joinable())
             this->_io_thread.join();
     }