Index: trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java	(revision 323)
+++ trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java	(revision 327)
@@ -126,5 +126,5 @@
 				}
 				OsmWriter.output(new FileOutputStream(file), new OsmWriter.All(layer.data, false));
-				if (!Main.pref.getBoolean("save.keepbackup"))
+				if (tmpFile != null && !Main.pref.getBoolean("save.keepbackup"))
 					tmpFile.delete();
 			} else if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(file.getPath())) {