Index: trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java	(revision 14156)
+++ trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java	(revision 14159)
@@ -3,4 +3,5 @@
 
 import java.awt.Color;
+import java.time.DateTimeException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -166,5 +167,5 @@
                 time = date.getTime() / 1000.;
                 return date;
-            } catch (UncheckedParseException e) {
+            } catch (UncheckedParseException | DateTimeException e) {
                 Logging.warn(e);
                 time = 0;
Index: trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java	(revision 14156)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java	(revision 14159)
@@ -4,4 +4,5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.time.DateTimeException;
 import java.util.LinkedList;
 import java.util.List;
@@ -16,4 +17,5 @@
 import org.openstreetmap.josm.data.osm.UserInfo;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.UncheckedParseException;
 import org.openstreetmap.josm.tools.XmlParsingException;
 import org.openstreetmap.josm.tools.date.DateUtils;
@@ -129,5 +131,5 @@
 
             return userInfo;
-        } catch (XPathException e) {
+        } catch (XPathException | UncheckedParseException | DateTimeException e) {
             throw new XmlParsingException(e);
         }
Index: trunk/src/org/openstreetmap/josm/tools/ExifReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ExifReader.java	(revision 14156)
+++ trunk/src/org/openstreetmap/josm/tools/ExifReader.java	(revision 14159)
@@ -5,4 +5,5 @@
 import java.io.File;
 import java.io.IOException;
+import java.time.DateTimeException;
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
@@ -117,5 +118,5 @@
                 return date;
             }
-        } catch (UncheckedParseException e) {
+        } catch (UncheckedParseException | DateTimeException e) {
             Logging.error(e);
         }
Index: trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java	(revision 14156)
+++ trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java	(revision 14159)
@@ -5,4 +5,5 @@
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
+import java.time.DateTimeException;
 import java.time.Instant;
 import java.time.ZoneId;
@@ -68,4 +69,5 @@
      * @return The date
      * @throws UncheckedParseException if the date does not match any of the supported date formats
+     * @throws DateTimeException if the value of any field is out of range, or if the day-of-month is invalid for the month-year
      */
     public static synchronized Date fromString(String str) {
@@ -78,4 +80,5 @@
      * @return The date in milliseconds since epoch
      * @throws UncheckedParseException if the date does not match any of the supported date formats
+     * @throws DateTimeException if the value of any field is out of range, or if the day-of-month is invalid for the month-year
      */
     public static synchronized long tsFromString(String str) {