diff --git a/src/main/java/io/bitsquare/gui/components/HSpacer.java b/src/main/java/io/bitsquare/gui/components/HSpacer.java
index 87c7ee45e3..bedd20dfcb 100644
--- a/src/main/java/io/bitsquare/gui/components/HSpacer.java
+++ b/src/main/java/io/bitsquare/gui/components/HSpacer.java
@@ -21,6 +21,8 @@ package io.bitsquare.gui.components;
 import javafx.scene.layout.*;
 
 public class HSpacer extends Pane {
+    public HSpacer() {
+    }
 
     public HSpacer(double width) {
         setPrefWidth(width);
diff --git a/src/main/java/io/bitsquare/gui/components/VSpacer.java b/src/main/java/io/bitsquare/gui/components/VSpacer.java
index cde9c54543..6832e1ed67 100644
--- a/src/main/java/io/bitsquare/gui/components/VSpacer.java
+++ b/src/main/java/io/bitsquare/gui/components/VSpacer.java
@@ -21,6 +21,8 @@ package io.bitsquare.gui.components;
 import javafx.scene.layout.*;
 
 public class VSpacer extends Pane {
+    public VSpacer() {
+    }
 
     public VSpacer(double height) {
         setPrefHeight(height);
diff --git a/src/main/java/io/bitsquare/user/User.java b/src/main/java/io/bitsquare/user/User.java
index 110d2be9dc..e610fc5a46 100644
--- a/src/main/java/io/bitsquare/user/User.java
+++ b/src/main/java/io/bitsquare/user/User.java
@@ -116,9 +116,10 @@ public class User implements Serializable {
     public void setCurrentBankAccount(@Nullable BankAccount bankAccount) {
         currentBankAccount = bankAccount;
 
-        BSFormatter.setFiatCurrencyCode(currentBankAccount.getCurrency().getCurrencyCode());
+        if (bankAccount != null)
+            BSFormatter.setFiatCurrencyCode(currentBankAccount.getCurrency().getCurrencyCode());
 
-        int index = -1;
+        int index;
         for (index = 0; index < bankAccounts.size(); index++) {
             if (currentBankAccount != null && currentBankAccount.equals(bankAccounts.get(index)))
                 break;