From b97c5ee0dcda509de57aac4c0de5c1e44b32ab37 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 22 Aug 2016 11:04:09 +0300
Subject: [PATCH] Update translation

---
 OsmAnd/res/values/strings.xml                           | 2 +-
 OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index fe3de6beff..f9d9e99dd6 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -186,7 +186,7 @@
     <string name="osm_live_ask_for_purchase">Please purchase OSM Live subscription first</string>
 
     <string name="osm_live_header">This subscription enables hourly updates for all maps around the world.
-        Most of the income goes back to the OSM community and is paid for each OSM contribution. 
+        Part of the income goes back to the OSM community and is paid for each OSM contribution. 
         If you love OsmAnd and OSM and want to support them, this is the perfect way to do it.</string>
     
     <string name="select_map_marker">Select map marker</string>
diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java b/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java
index 2130232d43..12b65ade96 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java
@@ -328,7 +328,7 @@ public class GpxImportHelper {
 	}
 
 	private void importFavourites(final GPXUtilities.GPXFile gpxFile, final String fileName, final boolean save) {
-		if(gpxFile.points == null || gpxFile.points.size() == 0) {
+		if(gpxFile == null || gpxFile.points == null || gpxFile.points.size() == 0) {
 			handleResult(gpxFile, fileName, save);
 			return;
 		}