diff --git a/package.nw/lib/callsigns.js b/package.nw/lib/callsigns.js
index 3d6c3802..005d4d82 100644
--- a/package.nw/lib/callsigns.js
+++ b/package.nw/lib/callsigns.js
@@ -829,7 +829,7 @@ function downloadCtyDat()
 {
   ctyDatStatus.innerHTML = "<b><i>Downloading...</i></b>";
   getBuffer(
-    "https://storage.googleapis.com/gt_app/ctydat.json?cb="+Date.now(),
+    "https://storage.googleapis.com/gt_app/ctydat.json?cb=" + Date.now(),
     processCtyDat,
     null,
     "https",
diff --git a/package.nw/lib/roster.js b/package.nw/lib/roster.js
index 26323512..7ec9c53a 100644
--- a/package.nw/lib/roster.js
+++ b/package.nw/lib/roster.js
@@ -2259,7 +2259,7 @@ function handleContextMenu(ev)
       g_targetITUz = ev.target.parentNode.id;
       g_ITUzMenu.popup(mouseX, mouseY);
     }
-    else if (name.startsWith("DXCC"))
+    else if (name && name.startsWith("DXCC"))
     {
       let dxcca = name.split("(");
       let dxcc = parseInt(dxcca[1]);