Index: trunk/src/org/openstreetmap/josm/tools/HttpClient.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/HttpClient.java	(revision 12589)
+++ trunk/src/org/openstreetmap/josm/tools/HttpClient.java	(revision 12590)
@@ -654,14 +654,16 @@
 
     private static void disconnect(final HttpURLConnection connection) {
-        // Fix upload aborts - see #263
-        connection.setConnectTimeout(100);
-        connection.setReadTimeout(100);
-        try {
-            Thread.sleep(100);
-        } catch (InterruptedException ex) {
-            Main.warn("InterruptedException in " + HttpClient.class + " during cancel");
-            Thread.currentThread().interrupt();
-        }
-        connection.disconnect();
+        if (connection != null) {
+            // Fix upload aborts - see #263
+            connection.setConnectTimeout(100);
+            connection.setReadTimeout(100);
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException ex) {
+                Main.warn("InterruptedException in " + HttpClient.class + " during cancel");
+                Thread.currentThread().interrupt();
+            }
+            connection.disconnect();
+        }
     }
 }