Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix

1 files changed, 2 insertions, 4 deletions

diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js
index eb24dfcab..db46e4f17 100644
--- a/app/scripts/lib/inpage-provider.js
+++ b/app/scripts/lib/inpage-provider.js
@@ -38,8 +38,6 @@ function MetamaskInpageProvider (connectionStream) {
     streamMiddleware.stream,
     (err) => logStreamDisconnectWarning('MetaMask RpcProvider', err)
   )
-  // start and stop polling to unblock first block lock
-
   // handle sendAsync requests via dapp-side rpc engine
   const engine = new RpcEngine()
   engine.push(createIdRemapMiddleware())
@@ -64,7 +62,7 @@ MetamaskInpageProvider.prototype.send = function (payload) {
     case 'eth_coinbase':
       // read from localStorage
       selectedAddress = self.publicConfigStore.getState().selectedAddress
-      result = selectedAddress
+      result = selectedAddress || null
       break
 
     case 'eth_uninstallFilter':
@@ -74,7 +72,7 @@ MetamaskInpageProvider.prototype.send = function (payload) {
 
     case 'net_version':
       const networkVersion = self.publicConfigStore.getState().networkVersion
-      result = networkVersion
+      result = networkVersion || null
       break
 
     // throw not-supported Error