diff --git a/lib/Worker.js b/lib/Worker.js
index b23df0fe..437dda26 100644
--- a/lib/Worker.js
+++ b/lib/Worker.js
@@ -8,42 +8,42 @@ module.exports = function(God) {
   var timer = null;
 
   God.Worker = {};
+  God.Worker.is_running = false;
 
-  var maxMemoryRestart = function(metrics, proc, cb) {
-    if (!metrics || !(proc && proc.pm2_env))
-      return cb();
-
-    var findMetrics = function(list, proc, callb) {
-      list.forEach(function(elem) {
-        if (elem && proc &&
-            elem.pm2_env && proc.pm2_env &&
-            elem.pm2_env.pm_id == proc.pm2_env.pm_id)
-          return callb(elem);
-      });
-      return callb(null);
-    };
-
-    findMetrics(metrics, proc, function(proc_monit) {
-      if (!proc_monit)
-        return cb();
-      if (God.clusters_db[proc_monit.pm_id] &&
-          proc.pm2_env.max_memory_restart &&
-          proc.pm2_env.max_memory_restart < (proc_monit.monit.memory / (1024*1024))) {
-          console.log('[PM2][WORKER] Process %s restarted because it exceeds --max-memory-restart value', proc_monit.pm_id);
-          God.restartProcessId({id: proc_monit.pm_id, env: proc.pm2_env.env},
-          function(err, data) {
-            if (err)
-              console.error(err.stack || err);
-            return cb();
-          });
-      }
-      else {
-        return cb();
-      }
-    });
+  var _getProcessById = function(pm_id) {
+    var proc = God.clusters_db[pm_id];
+    return proc ? proc : null;
   };
 
-  var versioningRefresh = function(proc, cb) {
+  var maxMemoryRestart = function(proc_key, cb) {
+    var proc = _getProcessById(proc_key.pm2_env.pm_id);
+
+    if (!(proc &&
+          proc.pm2_env &&
+          proc_key.monit &&
+          proc_key.monit.memory !== undefined &&
+          proc.pm2_env.max_memory_restart !== undefined))
+      return cb();
+
+    if (proc.pm2_env.max_memory_restart < (proc_key.monit.memory / (1024*1024))) {
+      console.log('[PM2][WORKER] Process %s restarted because it exceeds --max-memory-restart value',
+                  proc.pm2_env.pm_id);
+      God.restartProcessId({
+        id: proc.pm2_env.pm_id,
+        env: proc.pm2_env.env
+      }, function(err, data) {
+        if (err)
+          console.error(err.stack || err);
+        return cb();
+      });
+    }
+    else
+      return cb();
+  };
+
+  var versioningRefresh = function(proc_key, cb) {
+    var proc = _getProcessById(proc_key.pm2_env.pm_id);
+
     if (!(proc &&
           proc.pm2_env &&
           proc.pm2_env.versioning &&
@@ -59,6 +59,14 @@ module.exports = function(God) {
       if (err != null)
         return cb();
 
+      proc = _getProcessById(proc_key.pm2_env.pm_id);
+
+      if (!(proc &&
+            proc.pm2_env &&
+            proc.pm2_env.versioning &&
+            proc.pm2_env.versioning.repo_path))
+        return cb();
+
       proc.pm2_env.versioning = meta;
       proc.pm2_env.versioning.repo_path = repo_path;
       debug('[PM2][WORKER] %s parsed for versioning', proc.pm2_env.name);
@@ -67,27 +75,35 @@ module.exports = function(God) {
   };
 
   var tasks = function() {
-    var metrics = null;
+    if (God.Worker.is_running === true) {
+      debug('[PM2][WORKER] Worker is already running, skipping this round');
+      return false;
+    }
+    God.Worker.is_running = true;
 
     God.getMonitorData(null, function(err, data) {
-      if (err)
-        console.error(err.stack || err);
-      else
-        metrics = data;
-    });
+      if (err || !data || typeof(data) !== 'object') {
+        God.Worker.is_running = false;
+        return console.error(err);
+      }
 
-    async.eachLimit(Object.keys(God.clusters_db), 1, function(proc_key, next) {
-      var proc = God.clusters_db[proc_key];
+      async.eachLimit(data, 1, function(proc_key, next) {
+        if (!proc_key ||
+            !proc_key.pm2_env ||
+            proc_key.pm2_env.pm_id === undefined)
+          return next();
 
-      debug('[PM2][WORKER] Processing proc id:', proc_key);
+        debug('[PM2][WORKER] Processing proc id:', proc_key.pm2_env.pm_id);
 
-      versioningRefresh(proc, function() {
-        maxMemoryRestart(metrics, proc, function() {
-          next();
+        versioningRefresh(proc_key, function() {
+          maxMemoryRestart(proc_key, function() {
+            return next();
+          });
         });
+      }, function(err) {
+        God.Worker.is_running = false;
+        debug('[PM2][WORKER] My job here is done, next job in %d seconds', parseInt(cst.WORKER_INTERVAL));
       });
-    }, function(err) {
-      debug('[PM2][WORKER] My job here is done, next job in %d seconds', parseInt(cst.WORKER_INTERVAL));
     });
   };
 
diff --git a/test/bash/misc.sh b/test/bash/misc.sh
index 5a1d4d56..49da688d 100644
--- a/test/bash/misc.sh
+++ b/test/bash/misc.sh
@@ -13,7 +13,7 @@ echo -e "\033[1mRunning tests:\033[0m"
 # -max-memory-restart option && maxMemoryRestart (via JSON file)
 #
 $pm2 kill
-PM2_WORKER_INTERVAL=2000 $pm2 start big-array.js --max-memory-restart=19
+PM2_WORKER_INTERVAL=1000 $pm2 start big-array.js --max-memory-restart=19
 sleep 7
 $pm2 list
 should 'process should have been restarted' 'restart_time: 0' 0