Index: trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java	(revision 2559)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java	(revision 2560)
@@ -25,4 +25,5 @@
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -45,4 +46,5 @@
 import org.openstreetmap.josm.gui.history.HistoryBrowserDialogManager;
 import org.openstreetmap.josm.gui.history.HistoryLoadTask;
+import org.openstreetmap.josm.tools.BugReportExceptionHandler;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -324,11 +326,20 @@
             Runnable r = new Runnable() {
                 public void run() {
-                    for (OsmPrimitive p : primitives) {
-                        History h = HistoryDataSet.getInstance().getHistory(p.getPrimitiveId());
-                        if (h == null) {
-                            continue;
+                    try {
+                        for (OsmPrimitive p : primitives) {
+                            History h = HistoryDataSet.getInstance().getHistory(p.getPrimitiveId());
+                            if (h == null) {
+                                continue;
+                            }
+                            HistoryBrowserDialogManager.getInstance().show(h);
                         }
-                        HistoryBrowserDialogManager.getInstance().show(h);
+                    } catch (final Exception e) {
+                        SwingUtilities.invokeLater(new Runnable() {
+                            public void run() {
+                                BugReportExceptionHandler.handleException(e);
+                            }
+                        });
                     }
+
                 }
             };