diff --git a/lib/classes/Variables.js b/lib/classes/Variables.js
index a6842c4b3..ffbe65f3a 100644
--- a/lib/classes/Variables.js
+++ b/lib/classes/Variables.js
@@ -36,9 +36,9 @@ class PromiseTracker {
     const promise = prms;
     promise.waitList = `${variable} waited on by: ${specifier}`;
     promise.state = 'pending';
-    promise.then(
-      (value) => { promise.state = 'resolved'; return Promise.resolve(value); },
-      (error) => { promise.state = 'rejected'; return Promise.reject(error); });
+    promise.then( // creates a promise with the following effects but that we otherwise ignore
+      () => { promise.state = 'resolved'; },
+      () => { promise.state = 'rejected'; });
     this.promiseList.push(promise);
     this.promiseMap[variable] = promise;
     return promise;
@@ -393,7 +393,7 @@ class Variables {
         ].join('');
         ret = BbPromise.reject(new this.serverless.classes.Error(errorMessage));
       }
-      this.tracker.add(variableString, ret, propertyString);
+      ret = this.tracker.add(variableString, ret, propertyString);
     }
     return ret;
   }