Index: trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java	(revision 12287)
+++ trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java	(revision 12288)
@@ -186,25 +186,25 @@
     @Override
     public boolean checkUpload(APIDataSet apiDataSet) {
-        if (!Main.pref.getBoolean("fix.data.on.upload", true))
-            return true;
-
-        List<OsmPrimitive> objectsToUpload = apiDataSet.getPrimitives();
-        Collection<Command> cmds = new LinkedList<>();
-
-        for (OsmPrimitive osm : objectsToUpload) {
-            Map<String, String> keys = new HashMap<>(osm.getKeys());
-            if (!keys.isEmpty()) {
-                boolean modified = false;
-                for (FixData fix : deprecated) {
-                    if (fix.fixKeys(keys, osm))
-                        modified = true;
+        if (Main.pref.getBoolean("fix.data.on.upload", true)) {
+            Collection<Command> cmds = new LinkedList<>();
+
+            for (OsmPrimitive osm : apiDataSet.getPrimitives()) {
+                Map<String, String> keys = new HashMap<>(osm.getKeys());
+                if (!keys.isEmpty()) {
+                    boolean modified = false;
+                    for (FixData fix : deprecated) {
+                        if (fix.fixKeys(keys, osm))
+                            modified = true;
+                    }
+                    if (modified) {
+                        cmds.add(new ChangePropertyCommand(Collections.singleton(osm), keys));
+                    }
                 }
-                if (modified)
-                    cmds.add(new ChangePropertyCommand(Collections.singleton(osm), keys));
-            }
-        }
-
-        if (!cmds.isEmpty())
-            Main.main.undoRedo.add(new SequenceCommand(tr("Fix deprecated tags"), cmds));
+            }
+
+            if (!cmds.isEmpty()) {
+                Main.main.undoRedo.add(new SequenceCommand(tr("Fix deprecated tags"), cmds));
+            }
+        }
         return true;
     }
Index: trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java	(revision 12287)
+++ trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java	(revision 12288)
@@ -48,13 +48,12 @@
     @Override
     public boolean executeCommand() {
-        if (position < 0 || position >= relation.getMembersCount())
-            return true;
-
-        oldRole = relation.getMember(position).getRole();
-        if (newRole.equals(oldRole)) return true;
-        relation.setMember(position, new RelationMember(newRole, relation.getMember(position).getMember()));
-
-        oldModified = relation.isModified();
-        relation.setModified(true);
+        if (position >= 0 && position < relation.getMembersCount()) {
+            oldRole = relation.getMember(position).getRole();
+            if (!newRole.equals(oldRole)) {
+                relation.setMember(position, new RelationMember(newRole, relation.getMember(position).getMember()));
+                oldModified = relation.isModified();
+                relation.setModified(true);
+            }
+        }
         return true;
     }
Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/PresetLink.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/PresetLink.java	(revision 12287)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/PresetLink.java	(revision 12288)
@@ -45,10 +45,10 @@
         final String presetName = preset_name;
         Optional<TaggingPreset> found = TaggingPresets.getTaggingPresets().stream().filter(preset -> presetName.equals(preset.name)).findFirst();
-        if (!found.isPresent())
-            return false;
-        TaggingPreset t = found.get();
-        JLabel lbl = new TaggingPresetLabel(t);
-        lbl.addMouseListener(new TaggingPresetMouseAdapter(t));
-        p.add(lbl, GBC.eol().fill(GBC.HORIZONTAL));
+        if (found.isPresent()) {
+            TaggingPreset t = found.get();
+            JLabel lbl = new TaggingPresetLabel(t);
+            lbl.addMouseListener(new TaggingPresetMouseAdapter(t));
+            p.add(lbl, GBC.eol().fill(GBC.HORIZONTAL));
+        }
         return false;
     }