Index: applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java
===================================================================
--- applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java	(revision 12743)
+++ applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java	(revision 12746)
@@ -35,5 +35,5 @@
     private boolean centerView = false;
     
-    // Only one instance of thar class
+    // Only one instance of that class
     static private AgpifojDialog INSTANCE = null;
     
@@ -160,14 +160,18 @@
         }
         
-        imgDisplay.setImage(entry != null ? entry.file : null);
-        StringBuffer osd = new StringBuffer(entry.file.getName());
-        if (entry.elevation != null) {
-            osd.append(tr("\nAltitude: ")).append(entry.elevation.longValue()).append(" m");
+        if (entry != null) {
+            imgDisplay.setImage(entry.file);
+            StringBuffer osd = new StringBuffer(entry.file != null ? entry.file.getName() : "");
+            if (entry.elevation != null) {
+                osd.append(tr("\nAltitude: {0} m", entry.elevation.longValue()));
+            }
+            if (entry.speed != null) {
+                osd.append(tr("\n{0} km/h", (long) (3.6 * entry.speed)));
+            }
+            imgDisplay.setOsdText(osd.toString());
+        } else {
+            imgDisplay.setImage(null);
+            imgDisplay.setOsdText("");
         }
-        if (entry.speed != null) {
-            osd.append("\n").append((long) (3.6 * entry.speed)).append(tr(" km/h"));
-        }
-        imgDisplay.setOsdText(osd.toString());
     }
-
 }