Index: /applications/editors/josm/plugins/wikipedia/build.xml
===================================================================
--- /applications/editors/josm/plugins/wikipedia/build.xml	(revision 28471)
+++ /applications/editors/josm/plugins/wikipedia/build.xml	(revision 28472)
@@ -100,5 +100,5 @@
                 <attribute name="Plugin-Description" value="Simplifys linking OSM objects to Wikipedia articles"/>
                 <attribute name="Plugin-Icon" value="images/dialogs/wikipedia.png"/>
-                <!--<attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/wikipedia"/>-->
+                <attribute name="Plugin-Link" value="http://josm.openstreetmap.de/wiki/Plugins/wikipedia"/>
                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
Index: /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java
===================================================================
--- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java	(revision 28471)
+++ /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java	(revision 28472)
@@ -229,24 +229,26 @@
             articleNames.add(i.wikipediaArticle);
         }
-        final String url = "https://toolserver.org/~simon04/getGeoJSONStatus.php"
-                + "?lang=" + wikipediaLang.get()
-                + "&articles=" + encodeURL(Utils.join(",", articleNames));
-        System.out.println("Wikipedia: GET " + url);
         Map<String, Boolean> status = new HashMap<String, Boolean>();
-
-        try {
-            final Scanner scanner = new Scanner(new URL(url).openStream()).useDelimiter("\n");
-            while (scanner.hasNext()) {
-                //[article]\t[0|1]
-                final String line = scanner.next();
-                final String[] x = line.split("\t");
-                if (x.length == 2) {
-                    status.put(x[0], "1".equals(x[1]));
-                } else {
-                    System.err.println("Unknown element "+line);
-                }
-            }
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
+        if (!articleNames.isEmpty()) {
+            final String url = "https://toolserver.org/~simon04/getGeoJSONStatus.php"
+                    + "?lang=" + wikipediaLang.get()
+                    + "&articles=" + encodeURL(Utils.join(",", articleNames));
+            System.out.println("Wikipedia: GET " + url);
+
+            try {
+                final Scanner scanner = new Scanner(new URL(url).openStream()).useDelimiter("\n");
+                while (scanner.hasNext()) {
+                    //[article]\t[0|1]
+                    final String line = scanner.next();
+                    final String[] x = line.split("\t");
+                    if (x.length == 2) {
+                        status.put(x[0], "1".equals(x[1]));
+                    } else {
+                        System.err.println("Unknown element " + line);
+                    }
+                }
+            } catch (Exception ex) {
+                throw new RuntimeException(ex);
+            }
         }