Locations in eip-service can be empty.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/se/leap/bitmaskclient/EIP.java b/src/se/leap/bitmaskclient/EIP.java
index b3b2c95d..e773e3b9 100644
--- a/src/se/leap/bitmaskclient/EIP.java
+++ b/src/se/leap/bitmaskclient/EIP.java
@@ -332,14 +332,15 @@ public final class EIP extends IntentService {
 			}
 		}
 		
-		String closestLocation = offsets.firstEntry().getValue().iterator().next();
+		
+		String closestLocation = offsets.isEmpty() ? "" : offsets.firstEntry().getValue().iterator().next();
 		JSONArray gateways = null;
 		String chosenHost = null;
 		try {
 			gateways = eipDefinition.getJSONArray("gateways");
 			for (int i = 0; i < gateways.length(); i++) {
 				JSONObject gw = gateways.getJSONObject(i);
-				if ( gw.getString("location").equalsIgnoreCase(closestLocation) ){
+				if ( gw.getString("location").equalsIgnoreCase(closestLocation) || closestLocation.isEmpty()){
 					chosenHost = gw.getString("host");
 					break;
 				}