Index: trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java	(revision 1216)
+++ trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java	(revision 1217)
@@ -6,4 +6,8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.Collection;
+import java.util.LinkedList;
+
+import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
@@ -19,20 +23,24 @@
 
     public HistoryInfoAction() {
-        super(tr("OSM History Information"), "about",tr("Display history information about OSM ways or nodes."),
-        Shortcut.registerShortcut("core:history", tr("OSM History Information"), KeyEvent.VK_H, Shortcut.GROUP_HOTKEY), true);
+        super(tr("History of Node/Way"), "about",tr("Display history information about OSM ways or nodes."),
+        Shortcut.registerShortcut("core:history", tr("History of Node/Way"), KeyEvent.VK_H, Shortcut.GROUP_HOTKEY), true);
     }
 
     public void actionPerformed(ActionEvent e) {
+                final Collection<Object> sel = new LinkedList<Object>();
                 new Visitor() {
                         public void visit(Node n) {
-                OpenBrowser.displayUrl("http://www.openstreetmap.org/browse/node/" + n.id + "/history");
-            }
+                                OpenBrowser.displayUrl("http://www.openstreetmap.org/browse/node/" + n.id + "/history");
+                                sel.add(n);
+                        }
 
                         public void visit(Way w) {
                                 OpenBrowser.displayUrl("http://www.openstreetmap.org/browse/way/" + w.id + "/history");
+                                sel.add(w);
                         }
 
                         public void visit(Relation e) {
-                              OpenBrowser.displayUrl("http://www.openstreetmap.org/browse/relation/" + e.id + "/history");
+                                OpenBrowser.displayUrl("http://www.openstreetmap.org/browse/relation/" + e.id + "/history");
+                                sel.add(e);
                         }
 
@@ -43,4 +51,9 @@
                 }.visitAll();
 
+                if (sel.isEmpty()) {
+					JOptionPane.showMessageDialog(Main.parent,
+							tr("Please select at least one node or way."));
+					return;
+                }
     }