diff --git a/multidoge-0.1.7-bins.md5 b/multidoge-0.1.7-bins.md5
index 6a4c3fba1..0b10eef95 100644
--- a/multidoge-0.1.7-bins.md5
+++ b/multidoge-0.1.7-bins.md5
@@ -1,3 +1,3 @@
-6277491E0889942F5C0213A8CA6BA1DA  multidoge-0.1.7.dmg
+01914A7C7EB70E92B9230D49252A45C0  multidoge-0.1.7.dmg
 E69A81B1E86C7AA72D3B36D0D5FB4218  multidoge-0.1.7-linux.jar
 6AF7401318F4E3858933CD841074C3B6  multidoge-0.1.7-windows-setup.exe
diff --git a/pom.xml b/pom.xml
index 9903caf14..6d4602cfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -777,7 +777,7 @@
         <bitcoinj.version>0.10.3-MB-ALICE</bitcoinj.version>
 
         <!-- Version of XChange to use (multiple uses) -->
-        <xchange.version>3.1.0</xchange.version>
+        <xchange.version>3.0.0</xchange.version>
 
         <!-- Version of spongycastle to use -->
         <sc-light-jdk15on.version>1.47.0.2</sc-light-jdk15on.version>
diff --git a/release_notes.txt b/release_notes.txt
index 04bc4a463..15df9c0c0 100644
--- a/release_notes.txt
+++ b/release_notes.txt
@@ -1,7 +1,7 @@
 MultiDoge release notes:
 
 29 Jan 2016: 0.1.7
-+ Update XChange to 3.1.0
++ Update XChange to 3.0.0
 + Replace Cryptsy with Poloniex as source for the DOGE/BTC exchange rate
 + BTC/Fiat exchange rates are provided by BitcoinAverage
 + Updated checkpoints
\ No newline at end of file
diff --git a/release_notes_full.txt b/release_notes_full.txt
index 843f8d533..cfc151fba 100644
--- a/release_notes_full.txt
+++ b/release_notes_full.txt
@@ -1,6 +1,6 @@
 MultiDoge release notes:
 29 Jan 2016: 0.1.7
-+ Update XChange to 3.1.0
++ Update XChange to 3.0.0
 + Replace Cryptsy with Poloniex as source for the DOGE/BTC exchange rate
 + BTC/Fiat exchange rates are provided by BitcoinAverage
 + Updated checkpoints
diff --git a/src/main/java/org/multibit/MultiBit.java b/src/main/java/org/multibit/MultiBit.java
index 130de1429..a2cc16dca 100644
--- a/src/main/java/org/multibit/MultiBit.java
+++ b/src/main/java/org/multibit/MultiBit.java
@@ -614,11 +614,13 @@ public void run() {
             }
 
             // Upgrade path from cryptsy
-            if (bitcoinController.getModel().getUserPreference(ExchangeModel.TICKER_FIRST_ROW_EXCHANGE).equals(ExchangeData.CRYPTS_EXCHANGE_NAME)) {
-                bitcoinController.getModel().setUserPreference(ExchangeModel.TICKER_FIRST_ROW_EXCHANGE, ExchangeData.POLONIEX_EXCHANGE_NAME);
-            }
-            if (bitcoinController.getModel().getUserPreference(ExchangeModel.TICKER_SECOND_ROW_EXCHANGE).equals(ExchangeData.CRYPTS_EXCHANGE_NAME)) {
-                bitcoinController.getModel().setUserPreference(ExchangeModel.TICKER_SECOND_ROW_EXCHANGE, ExchangeData.POLONIEX_EXCHANGE_NAME);
+            if (bitcoinController != null && bitcoinController.getModel() != null) { // Mac sometimes isn't ready yet...
+                if (ExchangeData.CRYPTS_EXCHANGE_NAME.equals(bitcoinController.getModel().getUserPreference(ExchangeModel.TICKER_FIRST_ROW_EXCHANGE))) {
+                    bitcoinController.getModel().setUserPreference(ExchangeModel.TICKER_FIRST_ROW_EXCHANGE, ExchangeData.POLONIEX_EXCHANGE_NAME);
+                }
+                if (ExchangeData.CRYPTS_EXCHANGE_NAME.equals(bitcoinController.getModel().getUserPreference(ExchangeModel.TICKER_SECOND_ROW_EXCHANGE))) {
+                    bitcoinController.getModel().setUserPreference(ExchangeModel.TICKER_SECOND_ROW_EXCHANGE, ExchangeData.POLONIEX_EXCHANGE_NAME);
+                }
             }
         } catch (Exception e) {
             // An odd unrecoverable error occurred.
diff --git a/src/main/java/org/multibit/exchange/TickerTimerTask.java b/src/main/java/org/multibit/exchange/TickerTimerTask.java
index 491b5e3d8..7653d9f2a 100644
--- a/src/main/java/org/multibit/exchange/TickerTimerTask.java
+++ b/src/main/java/org/multibit/exchange/TickerTimerTask.java
@@ -241,13 +241,6 @@ public void createExchangeObjects(String newExchangeName) {
         Exchange exchangeDOGE = ExchangeFactory.INSTANCE.createExchange(PoloniexExchange.class.getName());
 
         if (exchange != null) {
-            try {
-                exchange.remoteInit();
-                exchangeDOGE.remoteInit();
-            } catch (IOException e) {
-                log.error("Could not contact exchanges for init!");
-                return;
-            }
 
             // Interested in the public market data feed (no authentication).
             marketDataServiceBTC = exchange.getPollingMarketDataService();
@@ -255,7 +248,7 @@ public void createExchangeObjects(String newExchangeName) {
             log.debug("marketDataServiceBTC = " + marketDataServiceBTC);
 
             // Get the list of available currencies.
-            exchangeSymbols = new ArrayList<CurrencyPair>(exchange.getMetaData().getMarketMetaDataMap().keySet());
+            exchangeSymbols = exchange.getMetaData().getCurrencyPairs();
             log.debug("exchangeSymbols = " + exchangeSymbols);
 
             if (exchangeSymbols != null) {