Index: applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java
===================================================================
--- applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java	(revision 33720)
+++ applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java	(revision 33721)
@@ -12,5 +12,4 @@
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Locale;
 import java.util.Set;
 
@@ -27,4 +26,5 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.date.DateUtils;
 
 class InfoPanel extends JPanel {
@@ -32,5 +32,4 @@
     private Collection<GpxTrack> tracks;
     private GpxTrack trk;
-    private DateFormat df;
 
     private JLabel label1 = new JLabel();
@@ -45,5 +44,4 @@
     InfoPanel() {
         super(new GridBagLayout());
-        df = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, Locale.getDefault());
         setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         add(label1, GBC.eol().insets(10, 0, 0, 0));
@@ -110,5 +108,5 @@
             but2.setVisible(false);
         } else {
-            label1.setText(df.format(wp.getTime()));
+            label1.setText(DateUtils.formatDateTime(wp.getTime(), DateFormat.DEFAULT, DateFormat.DEFAULT));
             but2.setVisible(true);
         }
@@ -123,8 +121,10 @@
         s = (String) wp.attr.get("ele");
         String s1 = "";
-        try {
-            s1 = String.format("H=%3.1f   ", Double.parseDouble(s));
-        } catch (Exception e) {
-            Logging.warn(e);
+        if (s != null) {
+            try {
+                s1 = String.format("H=%3.1f   ", Double.parseDouble(s));
+            } catch (NumberFormatException e) {
+                Logging.warn(e);
+            }
         }
         s1 = s1+"L="+(int) trk.length();