diff --git a/meshctrl.js b/meshctrl.js
index db0506c8..391b261c 100644
--- a/meshctrl.js
+++ b/meshctrl.js
@@ -2755,7 +2755,7 @@ function displayDeviceInfo(sysinfo, lastconnect, network, nodes) {
             }
         }
     }
-    if (node == null) {
+    if ((sysinfo == null && lastconnect == null && network == null) || (node == null)) {
         console.log("Invalid device id");
         process.exit(); return;
     }