Resolve merge conflicts

1 files changed, 10 insertions, 0 deletions

diff --git a/app/scripts/controllers/balance.js b/app/scripts/controllers/balance.js
index 4fa4c78fe..f83f294cc 100644
--- a/app/scripts/controllers/balance.js
+++ b/app/scripts/controllers/balance.js
@@ -5,7 +5,9 @@ const BN = require('ethereumjs-util').BN
 class BalanceController {
 
   constructor (opts = {}) {
+    this._validateParams(opts)
     const { address, accountTracker, txController, blockTracker } = opts
+
     this.address = address
     this.accountTracker = accountTracker
     this.txController = txController
@@ -65,6 +67,14 @@ class BalanceController {
     return pending
   }
 
+  _validateParams (opts) {
+    const { address, accountTracker, txController, blockTracker } = opts
+    if (!address || !accountTracker || !txController || !blockTracker) {
+      const error = 'Cannot construct a balance checker without address, accountTracker, txController, and blockTracker.'
+      throw new Error(error)
+    }
+  }
+
 }
 
 module.exports = BalanceController