diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelDbHelper.java b/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelDbHelper.java
index 388cbed36e..bc3fb3f4ed 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelDbHelper.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelDbHelper.java
@@ -362,22 +362,23 @@ public class TravelDbHelper {
 			cursor.close();
 		}
 		LinkedHashMap<WikivoyageSearchResult, List<WikivoyageSearchResult>> res = new LinkedHashMap<>();
-		parts = parts == null ? new String[]{} : parts;
-		for (String header : parts) {
-			WikivoyageSearchResult searchResult = headerObjs.get(header);
-			List<WikivoyageSearchResult> results = navMap.get(header);
-			if (results != null) {
-				Collections.sort(results, new Comparator<WikivoyageSearchResult>() {
-					@Override
-					public int compare(WikivoyageSearchResult o1, WikivoyageSearchResult o2) {
-						return collator.compare(o1.articleTitles.get(0), o2.articleTitles.get(0));
-					}
-				});
-				WikivoyageSearchResult emptyResult = new WikivoyageSearchResult();
-				emptyResult.articleTitles.add(header);
-				emptyResult.cityId = -1;
-				searchResult = searchResult != null ? searchResult : emptyResult;
-				res.put(searchResult, results);
+		if (parts != null) {
+			for (String header : parts) {
+				WikivoyageSearchResult searchResult = headerObjs.get(header);
+				List<WikivoyageSearchResult> results = navMap.get(header);
+				if (results != null) {
+					Collections.sort(results, new Comparator<WikivoyageSearchResult>() {
+						@Override
+						public int compare(WikivoyageSearchResult o1, WikivoyageSearchResult o2) {
+							return collator.compare(o1.articleTitles.get(0), o2.articleTitles.get(0));
+						}
+					});
+					WikivoyageSearchResult emptyResult = new WikivoyageSearchResult();
+					emptyResult.articleTitles.add(header);
+					emptyResult.cityId = -1;
+					searchResult = searchResult != null ? searchResult : emptyResult;
+					res.put(searchResult, results);
+				}
 			}
 		}
 		return res;