diff --git a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewCB.java
index 1b4760777b..6f15eb3b1c 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewCB.java
@@ -164,12 +164,15 @@ public class FiatAccountViewCB extends CachedViewCB<FiatAccountPm> implements Co
     void onSelectRegion() {
         countryComboBox.setVisible(true);
         Region region = regionComboBox.getSelectionModel().getSelectedItem();
-        countryComboBox.setItems(presentationModel.getAllCountriesFor(region));
+        if (region != null)
+            countryComboBox.setItems(presentationModel.getAllCountriesFor(region));
     }
 
     @FXML
     void onSelectCountry() {
-        presentationModel.setCountry(countryComboBox.getSelectionModel().getSelectedItem());
+        Country country = countryComboBox.getSelectionModel().getSelectedItem();
+        if (country != null)
+            presentationModel.setCountry(country);
     }
 
     @FXML