diff --git a/lib/contracts/blockchain.js b/lib/contracts/blockchain.js
index fe04ff9e..ffb88cd9 100644
--- a/lib/contracts/blockchain.js
+++ b/lib/contracts/blockchain.js
@@ -245,15 +245,18 @@ class Blockchain {
     let hash;
     let calledBacked = false;
 
-    function callback() {
+    function callback(err, receipt) {
       if (calledBacked) {
         return;
       }
+      if (!err && !receipt.contractAddress) {
+        return; // Not deployed yet. Need to wait
+      }
       if (interval) {
         clearInterval(interval);
       }
       calledBacked = true;
-      cb(...arguments);
+      cb(err, receipt);
     }
 
     // This interval is there to compensate for the event that sometimes doesn't get triggered when using WebSocket