diff --git a/golded3/geinit.cpp b/golded3/geinit.cpp
index 4fa17af..8735f4c 100644
--- a/golded3/geinit.cpp
+++ b/golded3/geinit.cpp
@@ -506,8 +506,11 @@ BOOL WINAPI GoldedCtrlHandler(DWORD dwCtrlType) {
 
 void Uninitialize()
 {
+  if (WideUsername) {
     delete WideUsername;
-    LookupNodeClear();
+    WideUsername = NULL;
+  }
+  LookupNodeClear();
 }