Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java	(revision 3059)
+++ /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java	(revision 3060)
@@ -280,4 +280,5 @@
                 content = reader.fetchHelpTopicContent(url, true);
             } catch(MissingHelpContentException e1) {
+                this.url = url;
                 handleMissingHelpContent(relativeHelpTopic);
                 return;
@@ -310,4 +311,5 @@
             content = reader.fetchHelpTopicContent(url, true);
         } catch(MissingHelpContentException e) {
+            this.url = url;
             handleMissingHelpContent(absoluteHelpTopic);
             return;
@@ -406,5 +408,8 @@
 
         public void actionPerformed(ActionEvent e) {
-            if (!getUrl().startsWith(HelpUtil.getWikiBaseHelpUrl())) {
+            String url = getUrl();
+            if(url == null)
+                return;
+            if (!url.startsWith(HelpUtil.getWikiBaseHelpUrl())) {
                 String message = tr(
                         "<html>The current URL <tt>{0}</tt><br>"
@@ -422,5 +427,4 @@
                 return;
             }
-            String url = getUrl();
             url = url.replaceAll("#[^#]*$", "");
             OpenBrowser.displayUrl(url+"?action=edit");
