Index: applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java
===================================================================
--- applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java	(revision 30197)
+++ applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java	(revision 30260)
@@ -479,7 +479,13 @@
      */
     private void writeGpxFile(ByteArrayOutputStream baos, String name, GpxData gpxData) throws IOException {
+        String filename;
+
         writeBoundary(baos);
         writeString(baos, "Content-Disposition: form-data; name=\"" + name + "\"; ");
-        writeString(baos, "filename=\"" + gpxData.storageFile.getName() + "\"");
+        if (gpxData.storageFile != null)
+            filename = gpxData.storageFile.getName();
+        else
+            filename = "not saved";
+        writeString(baos, "filename=\"" + filename + "\"");
         writeLineEnd(baos);
         writeString(baos, "Content-Type: application/octet-stream");
