Index: trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java	(revision 13335)
+++ trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java	(revision 13336)
@@ -402,5 +402,7 @@
      */
     public static String fixQuery(String query) {
-        return query.replaceFirst("out( body| skel| ids)?( id| qt)?;", "out meta$2;");
+        return query == null ? query : query
+                .replaceFirst("out( body| skel| ids)?( id| qt)?;", "out meta$2;")
+                .replaceFirst("(?s)\\[out:(json|csv)[^\\]]*\\]", "[out:xml]");
     }
 }
