diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js
index 39e9a258..c9a52fb5 100644
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
@@ -6957,7 +6957,6 @@ function handleWsjtxDecode(newMessage)
   theTimeStamp =
     timeNowSec() - (timeNowSec() % 86400) + parseInt(newMessage.TM / 1000);
   var messageColor = "white";
-  if (CQ == true) messageColor = "cyan";
 
   // Break up the decoded message
   var decodeWords = newMessage.Msg.split(" ").slice(0, 5);
@@ -7003,6 +7002,7 @@ function handleWsjtxDecode(newMessage)
       CQ = true;
       msgDXcallsign = "CQ";
     }
+
     if (decodeWords.length == 4 && CQ == true)
     {
       msgDXcallsign += " " + decodeWords[1];
@@ -7023,6 +7023,12 @@ function handleWsjtxDecode(newMessage)
       msgDEcallsign = decodeWords[1];
     }
 
+    if (decodeWords[2] == "RR73")
+    {
+      CQ = true;
+      msgDXcallsign = "RR73";
+    }
+
     var callsign = null;
 
     var hash = msgDEcallsign + newMessage.OB + newMessage.OM;
@@ -7222,7 +7228,7 @@ function handleWsjtxDecode(newMessage)
       }
     }
 
-    if (callsign.pota == null && g_potaSpots.some(item => item.activator === callsign.DEcall))
+    if (callsign.pota == null && g_potaSpots && g_potaSpots.some(item => item.activator === callsign.DEcall))
     {
       callsign.pota = g_potaSpots.filter(item => item.activator === callsign.DEcall)[0];
     }
diff --git a/package.nw/lib/roster/processRosterFiltering.js b/package.nw/lib/roster/processRosterFiltering.js
index 513caaee..b4fcd8dd 100644
--- a/package.nw/lib/roster/processRosterFiltering.js
+++ b/package.nw/lib/roster/processRosterFiltering.js
@@ -50,8 +50,10 @@ function processRosterFiltering(callRoster, rosterSettings)
       entry.tx = true;
       if (callObj.pota == null)
       {
-        callObj.pota.reference = "?-????";
-        callObj.pota.name = "Unknown Park";
+        callObj.pota = {
+          reference: "?-????",
+          name: "Unknown Park"
+        }
       }
       continue;
     }