diff --git a/src/indexEthereum.js b/src/indexEthereum.js
index <HASH>..<HASH> 100644
--- a/src/indexEthereum.js
+++ b/src/indexEthereum.js
@@ -148,7 +148,7 @@ export const EthereumCurrencyPluginFactory: AbcCurrencyPluginFactory = {
               .getText(DATA_STORE_FOLDER, 'walletLocalData')
 
           ethereumEngine.walletLocalData = new WalletLocalData(result)
-          ethereumEngine.walletLocalData.ethereumAddress = this.walletInfo.keys.ethereumAddress
+          ethereumEngine.walletLocalData.ethereumAddress = ethereumEngine.walletInfo.keys.ethereumAddress
         } catch (err) {
           try {
             io.console.info(err)
@@ -162,8 +162,8 @@ export const EthereumCurrencyPluginFactory: AbcCurrencyPluginFactory = {
           } catch (e) {
             io.console.error('Error writing to localDataStore. Engine not started:' + err)
           }
-          return ethereumEngine
         }
+        return ethereumEngine
       },
 
       parseUri: (uri: string) => {
Fix initialization bugs

Don't use "this" to get walletInfo as it is passed into makeEngine
Properly return ethereumEngine when no errors occur