diff --git a/src/processing/mode/p5js/p5jsEditor.java b/src/processing/mode/p5js/p5jsEditor.java
index 7b8774f..c7137a9 100644
--- a/src/processing/mode/p5js/p5jsEditor.java
+++ b/src/processing/mode/p5js/p5jsEditor.java
@@ -1,10 +1,12 @@
 package processing.mode.p5js;
 
+import java.awt.Desktop;
 import java.awt.EventQueue;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
+import java.net.URI;
 import java.util.Arrays;
 
 import javax.swing.JMenu;
@@ -284,7 +286,13 @@ public void handleRun() {
         restartServer();
       }
       statusNotice("Server running at " + server.getAddress());
-      Platform.openURL(server.getAddress());
+      //Platform.openURL(server.getAddress());
+
+      try {
+        Desktop.getDesktop().browse(new URI(server.getAddress()));
+      } catch (Exception e) {
+        statusError(e);
+      }
     }
   }
 
@@ -394,9 +402,9 @@ public void run() {
 
 
   /**
-   *  Start the internal server for this sketch.
-   *  @param root the root folder for the server to serve from
-   *  @return true if it was started anew, false if it was running
+   * Start the internal server for this sketch.
+   * @param root the root folder for the server to serve from
+   * @return true if it was started anew, false if it was running
    */
   protected void restartServer() {
     if (server != null && server.isDead()) {
diff --git a/src/processing/mode/p5js/server/HttpServer.java b/src/processing/mode/p5js/server/HttpServer.java
index 4542c0f..b1e3bc0 100644
--- a/src/processing/mode/p5js/server/HttpServer.java
+++ b/src/processing/mode/p5js/server/HttpServer.java
@@ -40,11 +40,10 @@ public class HttpServer {
 
   public HttpServer(p5jsEditor editor) {
     this(editor, (int) (8000 + Math.random() * 1000));
-    //root = editor.getSketch().getFolder();
   }
 
 
-  public HttpServer(p5jsEditor editor, final int port) {
+  public HttpServer(p5jsEditor editor, int port) {
     this.editor = editor;
     this.port = port;
 
@@ -83,7 +82,11 @@ public void run() {
         running = true;
         ServerSocket socket = null;
         try {
+//          try {
           socket = new ServerSocket(port);
+//          } catch (BindException be) {
+//            // socket already in use; try another
+//          }
           while (Thread.currentThread() == thread) {
             @SuppressWarnings("resource")
             Socket s = socket.accept();