diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js
index fad8c73b..e1962fe2 100644
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
@@ -6917,7 +6917,7 @@ function handleWsjtxDecode(newMessage)
     var hash = msgDEcallsign + newMessage.OB + newMessage.OM;
     if (hash in g_liveCallsigns) callsign = g_liveCallsigns[hash];
 
-    if (validQTH == "" && msgDEcallsign in g_gtCallsigns)
+    if (validQTH == "" && msgDEcallsign in g_gtCallsigns && g_gtCallsigns[msgDEcallsign] in g_gtFlagPins)
     {
       if (g_gtFlagPins[g_gtCallsigns[msgDEcallsign]].grid.length > 0) { validQTH = g_gtFlagPins[g_gtCallsigns[msgDEcallsign]].grid; }
     }
diff --git a/package.nw/lib/gtws.js b/package.nw/lib/gtws.js
index f6a0a382..c683fb15 100644
--- a/package.nw/lib/gtws.js
+++ b/package.nw/lib/gtws.js
@@ -109,7 +109,8 @@ function gtConnectChat()
       }
       else
       {
-        g_gtState = ChatState.error;
+        // Not fatal!
+        console.log("Unknown oams message '" + jsmesg.type + "' ignoring");
       }
     }
   };