Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryExportAction.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryExportAction.java	(revision 31167)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryExportAction.java	(revision 31168)
@@ -39,5 +39,6 @@
 
 		if (pane.getValue() != null
-				&& (int) pane.getValue() == JOptionPane.OK_OPTION) {
+				&& (int) pane.getValue() == JOptionPane.OK_OPTION
+				&& dialog.chooser != null) {
 			if (dialog.group.isSelected(dialog.all.getModel())) {
 				export(MapillaryData.getInstance().getImages());
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryExportWriterThread.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryExportWriterThread.java	(revision 31167)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryExportWriterThread.java	(revision 31168)
@@ -2,10 +2,24 @@
 
 import java.awt.image.BufferedImage;
+import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.util.concurrent.ArrayBlockingQueue;
 
 import javax.imageio.ImageIO;
 
+import org.apache.sanselan.ImageReadException;
+import org.apache.sanselan.ImageWriteException;
+import org.apache.sanselan.formats.jpeg.exifRewrite.ExifRewriter;
+import org.apache.sanselan.formats.tiff.constants.GPSTagConstants;
+import org.apache.sanselan.formats.tiff.constants.TagInfo;
+import org.apache.sanselan.formats.tiff.constants.TiffDirectoryConstants;
+import org.apache.sanselan.formats.tiff.constants.TiffFieldTypeConstants;
+import org.apache.sanselan.formats.tiff.fieldtypes.FieldType;
+import org.apache.sanselan.formats.tiff.write.TiffOutputDirectory;
+import org.apache.sanselan.formats.tiff.write.TiffOutputField;
+import org.apache.sanselan.formats.tiff.write.TiffOutputSet;
 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -40,5 +54,5 @@
 	public void run() {
 		monitor.setCustomText("Downloaded 0/" + amount);
-		File outputfile = null;
+		File tempFile = null;
 		BufferedImage img;
 		MapillaryImage mimg = null;
@@ -48,11 +62,43 @@
 				img = queue.take();
 				mimg = queueImages.take();
-				finalPath = path + "/" + mimg.getKey() + ".jpeg";
-				outputfile = new File(finalPath);
-				ImageIO.write(img, "jpeg", outputfile);
+				finalPath = path + "/" + mimg.getKey();
+				tempFile = new File(finalPath + ".tmp");
+
+				ImageIO.write(img, "jpg", tempFile);
+
+				// Write EXIF tags
+				TiffOutputSet outputSet = new TiffOutputSet();
+				TiffOutputDirectory exifDirectory = outputSet
+						.getOrCreateGPSDirectory();
+				FieldType fieldType = TiffFieldTypeConstants.FIELD_TYPE_RATIONAL;
+				TiffOutputField directionref = TiffOutputField.create(GPSTagConstants.GPS_TAG_GPS_IMG_DIRECTION_REF, outputSet.byteOrder, "T");
+				exifDirectory.add(directionref);
+				TiffOutputField direction = TiffOutputField.create(
+						new TagInfo("GPS Img Direction", 17, fieldType , 1, TiffDirectoryConstants.EXIF_DIRECTORY_GPS), outputSet.byteOrder, mimg.getCa());
+				exifDirectory.add(direction);
+				try {
+					outputSet.setGPSInDegrees(mimg.getLatLon().lon(), mimg
+							.getLatLon().lat());
+				} catch (ImageWriteException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				OutputStream os = new BufferedOutputStream(
+						new FileOutputStream(finalPath + ".jpg"));
+				new ExifRewriter().updateExifMetadataLossless(tempFile, os,
+						outputSet);
+				tempFile.delete();
+				os.close();
+
 			} catch (InterruptedException e1) {
 				// TODO Auto-generated catch block
 				e1.printStackTrace();
 			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (ImageReadException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (ImageWriteException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();