diff --git a/lib/Interactor/Daemon.js b/lib/Interactor/Daemon.js
index 9fdefda8..170b5b68 100644
--- a/lib/Interactor/Daemon.js
+++ b/lib/Interactor/Daemon.js
@@ -201,10 +201,14 @@ var Daemon = {
       }
     }, function(err, km_data) {
       self.current_km_data = km_data;
+      if (err) return cb(err);
 
-      if (err) {
-        return cb(err);
-      }
+      if (self.opts.RECYCLE) {
+        if (!km_data.name) {
+          console.error('Error no previous machine name for recycle option returned!');
+        }
+        self.opts.MACHINE_NAME = km_data.name;
+      };
 
       // For Human feedback
       if (process.send)
diff --git a/lib/Interactor/InteractorDaemonizer.js b/lib/Interactor/InteractorDaemonizer.js
index 4e6e03dd..019cd0ac 100644
--- a/lib/Interactor/InteractorDaemonizer.js
+++ b/lib/Interactor/InteractorDaemonizer.js
@@ -336,9 +336,8 @@ InteractorDaemonizer.getSetKeys = function(secret_key, public_key, machine_name,
   try {
     var interaction_conf     = json5.parse(fs.readFileSync(cst.INTERACTION_CONF));
 
-    if (!secret_key) {
+    if (!secret_key)
       recycle          = recycle ? recycle : interaction_conf.recycle;
-    }
 
     public_key       = public_key   ? public_key : interaction_conf.public_key;
     machine_name     = machine_name ? machine_name : interaction_conf.machine_name;