diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
index fcb50ca04f..462607b6d0 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
@@ -242,7 +242,6 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
 		}
 	}
 	
-	@SuppressWarnings("unused")
 	private void registerDisablePreference(OsmandPreference p, String value, OsmandPreference<Boolean> disable) {
 		LinkedHashMap<String, Object> vals = (LinkedHashMap<String, Object>) listPrefValues.get(p.getId());
 		vals.put(value, disable);
@@ -304,7 +303,9 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
 			k++;
 		}
 		ListPreference lp = createListPreference(b, intDescriptions, ints, title, summary);
-		registerDisablePreference(b, getString(R.string.confirm_every_run), disable);
+		if(disable != null) {
+			registerDisablePreference(b, getString(R.string.confirm_every_run), disable);
+		}
 		return lp;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsStorage.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsStorage.java
index 1262bd3f6f..0392c21eca 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsStorage.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsStorage.java
@@ -245,7 +245,7 @@ public class OsMoGroupsStorage {
 		}
 		
 		public List<OsMoDevice> getVisibleGroupUsers(String mygid) {
-			if(!isActive() &&  !isMainGroup()) {
+			if(!isActive() && !isMainGroup()) {
 				return Collections.emptyList();
 			}
 			return getGroupUsers(mygid);