diff --git a/lib/pool.js b/lib/pool.js
index 922f32b..e4c7fef 100644
--- a/lib/pool.js
+++ b/lib/pool.js
@@ -195,7 +195,7 @@ function Miner(id, login, pass, ipAddress, startingDiff, messageSender, protoVer
     let pass_split = pass.split(":");
     this.error = "";
     this.identifier = pass_split[0];
-    if (agent.includes('MinerGate')){
+    if (agent && agent.includes('MinerGate')){
         this.identifier = "MinerGate";
     }
     this.paymentID = null;
@@ -224,7 +224,7 @@ function Miner(id, login, pass, ipAddress, startingDiff, messageSender, protoVer
     this.fixed_diff = false;
     this.difficulty = startingDiff;
     this.connectTime = Date.now();
-    if (agent.includes('NiceHash')){
+    if (agent && agent.includes('NiceHash')){
         this.fixed_diff = true;
         this.difficulty = global.coinFuncs.niceHashDiff;
     }
@@ -457,7 +457,8 @@ function Miner(id, login, pass, ipAddress, startingDiff, messageSender, protoVer
             this.cachedJob = {
                 blob: blob,
                 job_id: newJob.id,
-                target: target
+                target: target,
+                id: this.id
             };
             return this.cachedJob;
         };
@@ -580,7 +581,7 @@ function handleMinerData(method, params, ip, portData, sendReply, pushMessage) {
     }
     switch (method) {
         case 'login':
-            if (!params.login || (!params.pass && !params.agent.includes('MinerGate'))) {
+            if (!params.login || (!params.pass && params.agent && !params.agent.includes('MinerGate'))) {
                 sendReply("No login/password specified");
                 return;
             }