Index: src/org/openstreetmap/josm/actions/HelpAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/HelpAction.java	(revision 162)
+++ src/org/openstreetmap/josm/actions/HelpAction.java	(revision 163)
@@ -10,4 +10,6 @@
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.io.IOException;
+import java.io.StringReader;
 
 import javax.swing.AbstractAction;
@@ -160,5 +162,9 @@
 	public void setHelpUrl(String url) {
 		this.url = url;
-		help.setText(reader.read(url));
+		try {
+			help.read(new StringReader(reader.read(url)), help.getEditorKit().createDefaultDocument());
+        } catch (IOException e) {
+        	help.setText("Error while loading page "+url);
+        }
 		helpBrowser.setVisible(true);
 	}