Index: trunk/src/org/openstreetmap/josm/actions/UploadAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UploadAction.java	(revision 1678)
+++ trunk/src/org/openstreetmap/josm/actions/UploadAction.java	(revision 1679)
@@ -527,7 +527,9 @@
         // For any other exception just notify the user
         //
-        String msg = e.getMessage().substring(0,Math.min(80, e.getMessage().length()));
-        if (msg.length() < e.getMessage().length()) {
-            msg += " ...";
+        String msg;
+        if (e.getMessage() == null) {
+            msg = e.toString();
+        } else {
+            msg = e.getMessage();
         }
         e.printStackTrace();
@@ -538,5 +540,4 @@
                 JOptionPane.ERROR_MESSAGE
         );
-
     }