Index: /applications/editors/josm/plugins/pointInfo/README.md
===================================================================
--- /applications/editors/josm/plugins/pointInfo/README.md	(revision 30371)
+++ /applications/editors/josm/plugins/pointInfo/README.md	(revision 30372)
@@ -14,5 +14,5 @@
 ##Websites
 
- * OSM wiki - not availavle yet
+ * OSM wiki - not available yet
  * [JOSM svn](https://trac.openstreetmap.org/browser/subversion/applications/editors/josm/plugins/pointInfo)
  * [Github](https://github.com/mkyral/josm-pointInfo)
Index: /applications/editors/josm/plugins/pointInfo/build.xml
===================================================================
--- /applications/editors/josm/plugins/pointInfo/build.xml	(revision 30371)
+++ /applications/editors/josm/plugins/pointInfo/build.xml	(revision 30372)
@@ -15,5 +15,5 @@
 
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="PointInfo: Replace org.json with JOSM embedded (GPL-compliant) jsonp."/>
+    <property name="commit.message" value="PointInfo: Replace openWebPage function by josm.tools.OpenBrowser."/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="6238"/>
Index: /applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java
===================================================================
--- /applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java	(revision 30371)
+++ /applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java	(revision 30372)
@@ -22,5 +22,4 @@
 import java.awt.Cursor;
 import java.awt.Point;
-import java.awt.Desktop;
 import java.awt.event.ActionEvent;
 import java.awt.event.InputEvent;
@@ -39,6 +38,4 @@
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
-import java.net.URI;
-import java.net.URISyntaxException;
 
 import org.openstreetmap.josm.Main;
@@ -55,4 +52,5 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.OpenBrowser;
 import org.xml.sax.SAXException;
 
@@ -91,15 +89,4 @@
     private static Cursor getCursor() {
         return ImageProvider.getCursor("crosshair", "info-sml");
-    }
-
-    private static void openWebpage(URI uri) {
-        Desktop desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null;
-        if (desktop != null && desktop.isSupported(Desktop.Action.BROWSE)) {
-            try {
-                desktop.browse(uri);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
     }
 
@@ -137,8 +124,7 @@
                             mRuian.performAction(hle.getURL().toString());
                           } else {
-                            try {
-                                openWebpage(hle.getURL().toURI());
-                            } catch (URISyntaxException e) {
-                                e.printStackTrace();
+                            String ret = OpenBrowser.displayUrl(hle.getURL().toString());
+                            if (ret != null) {
+                              PointInfoUtils.showNotification(ret, "error");
                             }
                           }