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 @@ Please purchase OSM Live subscription first 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. Select map marker 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; }