diff --git a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
index da3d5c8fce..556d7ad57b 100644
--- a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
+++ b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
@@ -1161,12 +1161,10 @@ public class MapMarkersHelper {
 					removeGroupActiveMarkers(group, true);
 					return;
 				}
-
-				for (FavouritePoint fp : favGroup.getPoints()) {
+				List<FavouritePoint> favPoints = new ArrayList<>(favGroup.getPoints());
+				for (FavouritePoint fp : favPoints) {
 					addNewMarkerIfNeeded(group, groupMarkers, new LatLon(fp.getLatitude(), fp.getLongitude()), fp.getName(), fp, null);
 				}
-
-
 			} else if (group.getType() == MapMarkersGroup.GPX_TYPE) {
 				GpxSelectionHelper gpxHelper = ctx.getSelectedGpxHelper();
 				File file = new File(group.getId());
diff --git a/OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java b/OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java
index f1d28dfa2b..916f64fc59 100644
--- a/OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java
@@ -132,7 +132,7 @@ public class ContributionVersionActivity extends OsmandListActivity {
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
-		if(ACTIVITY_TO_INSTALL == requestCode && resultCode != RESULT_OK){
+		if (ACTIVITY_TO_INSTALL == requestCode && resultCode != RESULT_OK && currentInstalledDate != null) {
 			updateInstalledApp(false, currentInstalledDate);
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java b/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
index 843a9576b7..33344bcf3a 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
@@ -393,9 +393,9 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
 			canvas.translate(box.getCenterPixelX() - contextMarker.getWidth() / 2, box.getCenterPixelY() - contextMarker.getHeight());
 			contextMarker.draw(canvas);
 		}
-		if (this.nightMode != nightMode && currentWidgetState != null) {
+		if (this.nightMode != nightMode) {
 			this.nightMode = nightMode;
-			updateQuickActionButton(currentWidgetState);
+			updateQuickActionButton(currentWidgetState != null && currentWidgetState);
 		}
 		setupQuickActionBtnVisibility();
 	}