From 103adf8a90ccce7f2e651b8212adcbfe9c1dd258 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Mon, 3 Oct 2016 11:36:31 +0300
Subject: [PATCH] Fix NPE

---
 OsmAnd/res/values/phrases.xml                        | 2 +-
 OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index c32f5d8747..7c9acc47f1 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -213,7 +213,7 @@
 	<string name="poi_fuel_lpg">LPG</string>
 	<string name="poi_fuel_octane_80">Octane 80</string>
 	<string name="poi_fuel_octane_91">Octane 91</string>
-	<string name="poi_fuel_octane_92">Octane 92</string>
+	<string name="poi_fuel_octane_92">Octane &#x0025;&#x0025;92</string>
 	<string name="poi_fuel_octane_95">Octane 95</string>
 	<string name="poi_fuel_octane_98">Octane 98</string>
 	<string name="poi_fuel_octane_100">Octane 100</string>
diff --git a/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java b/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java
index f0316c47b9..7ad224d687 100644
--- a/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java
+++ b/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java
@@ -340,7 +340,10 @@ public class PoiFiltersHelper {
 	public void loadSelectedPoiFilters() {
 		Set<String> filters = application.getSettings().getSelectedPoiFilters();
 		for (String f : filters) {
-			selectedPoiFilters.add(getFilterById(f));
+			PoiUIFilter filter = getFilterById(f);
+			if (filter != null) {
+				selectedPoiFilters.add(filter);
+			}
 		}
 	}