Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java	(revision 11542)
+++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java	(revision 11544)
@@ -586,5 +586,4 @@
                 }
                 currentTask = null;
-                currentFuture = null;
             }
         }
Index: trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java	(revision 11542)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java	(revision 11544)
@@ -30,13 +30,12 @@
         Font f = UIManager.getFont("Label.font");
         StyleSheet ss = new StyleSheet();
-        String rule = MessageFormat.format(
+        ss.addRule("body {" + MessageFormat.format(
                 "font-family: ''{0}'';font-size: {1,number}pt; font-weight: {2}; font-style: {3}",
                 f.getName(),
                 f.getSize(),
                 f.isBold() ? "bold" : "normal",
-                        f.isItalic() ? "italic" : "normal"
-        );
-        rule = "body {" + rule + '}';
-        rule = MessageFormat.format(
+                f.isItalic() ? "italic" : "normal"
+        ) + '}');
+        ss.addRule("strong {" + MessageFormat.format(
                 "font-family: ''{0}'';font-size: {1,number}pt; font-weight: {2}; font-style: {3}",
                 f.getName(),
@@ -44,7 +43,5 @@
                 "bold",
                 f.isItalic() ? "italic" : "normal"
-        );
-        rule = "strong {" + rule + '}';
-        ss.addRule(rule);
+        ) + '}');
         ss.addRule("a {text-decoration: underline; color: blue}");
         ss.addRule("ul {margin-left: 1cm; list-style-type: disc}");
Index: trunk/src/org/openstreetmap/josm/io/OsmConnection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmConnection.java	(revision 11542)
+++ trunk/src/org/openstreetmap/josm/io/OsmConnection.java	(revision 11544)
@@ -67,15 +67,14 @@
             throw new OsmTransferException(e);
         }
-        String token;
-        if (response == null) {
-            token = ":";
-        } else if (response.isCanceled()) {
-            cancel = true;
-            return;
-        } else {
-            String username = response.getUsername() == null ? "" : response.getUsername();
-            String password = response.getPassword() == null ? "" : String.valueOf(response.getPassword());
-            token = username + ':' + password;
-            con.setHeader("Authorization", "Basic "+Base64.getEncoder().encodeToString(token.getBytes(StandardCharsets.UTF_8)));
+        if (response != null) {
+            if (response.isCanceled()) {
+                cancel = true;
+                return;
+            } else {
+                String username = response.getUsername() == null ? "" : response.getUsername();
+                String password = response.getPassword() == null ? "" : String.valueOf(response.getPassword());
+                String token = username + ':' + password;
+                con.setHeader("Authorization", "Basic "+Base64.getEncoder().encodeToString(token.getBytes(StandardCharsets.UTF_8)));
+            }
         }
     }