diff --git a/JobMiner.js b/JobMiner.js
index 606fa42..054f780 100644
--- a/JobMiner.js
+++ b/JobMiner.js
@@ -4,14 +4,15 @@ module.exports = {
     tick(creep){
         const source = Game.getObjectById(creep.memory.job.source);
         if(!creep.pos.isNearTo(source)) { creep.moveTo(source); return; }
-        if(creep.memory.container) moveToContainer(creep);
         if(!(Game.time%100)) scanForContainer(creep, source);
+        moveToContainer(creep);
         creep.harvest(source);
     }
 }
 
 function moveToContainer(creep){
     const container = Game.getObjectById(creep.memory.container);
+    if(!container) return;
     if(container.pos.x === creep.pos.x && container.pos.y === creep.pos.y) return;
     creep.moveTo(container);
 }