diff --git a/bin/ssu b/bin/ssu
index 6d7b4a50..b035b82c 100755
--- a/bin/ssu
+++ b/bin/ssu
@@ -22,8 +22,8 @@ wreck.get('http://localhost:7070/pid?fingerprint=' + fingerprint, opts, function
     process.exit(2)
   }
 
-  if (!payload.pid) {
-    console.log('The requested lamassu-machine is not connected.')
+  if (!payload || !payload.pid) {
+    console.log('The requested lamassu-machine appears to be running an old version.')
     process.exit(3)
   }
 
diff --git a/lib/routes.js b/lib/routes.js
index e2cf2f11..4bcc5939 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -26,7 +26,7 @@ function poll(req, res) {
   var fingerprint = getFingerprint(req)
   var pid = req.query.pid
 
-  if (pid) pids[fingerprint] = {pid: pid, ts: Date.now()}
+  pids[fingerprint] = {pid: pid, ts: Date.now()}
 
   logger.debug('poll request from: %s', fingerprint);