Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java	(revision 13495)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java	(revision 13496)
@@ -495,7 +495,5 @@
             if (!sel.isEmpty()) {
                 DataSet ds = sel.iterator().next().getDataSet();
-                if (ds != null) {
-                    disableApply = ds.isLocked();
-                }
+                disableApply = ds != null && ds.isLocked();
             }
             answer = new PresetDialog(p, title, preset_name_label ? null : (ImageIcon) getValue(Action.SMALL_ICON),
Index: /trunk/test/unit/org/openstreetmap/josm/actions/upload/ValidateUploadHookTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/upload/ValidateUploadHookTest.java	(revision 13495)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/upload/ValidateUploadHookTest.java	(revision 13496)
@@ -21,5 +21,5 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().platform().fakeAPI().timeout(20000);
+    public JOSMTestRules test = new JOSMTestRules().platform().fakeAPI().timeout(30000);
 
     /**