diff --git a/flutter-idea/src/io/flutter/run/daemon/FlutterApp.java b/flutter-idea/src/io/flutter/run/daemon/FlutterApp.java
index e93c0770d..9542ee060 100644
--- a/flutter-idea/src/io/flutter/run/daemon/FlutterApp.java
+++ b/flutter-idea/src/io/flutter/run/daemon/FlutterApp.java
@@ -48,8 +48,8 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
@@ -748,14 +748,14 @@ public void onAppDebugPort(@NotNull DaemonEvent.AppDebugPort debugInfo) {
     String uri = debugInfo.baseUri;
     if (uri != null) {
       if (uri.startsWith("file:")) {
-        // Convert the file: url to a path.
+        // Convert the file: uri to a path.
         try {
-          uri = new URL(uri).getPath();
+          uri = (new URI(uri).getPath());
           if (uri.endsWith(File.separator)) {
             uri = uri.substring(0, uri.length() - 1);
           }
         }
-        catch (MalformedURLException e) {
+        catch (URISyntaxException e) {
           // ignore
         }
       }
diff --git a/flutter-idea/src/io/flutter/utils/UrlUtils.java b/flutter-idea/src/io/flutter/utils/UrlUtils.java
index 10f55791d..b173da555 100644
--- a/flutter-idea/src/io/flutter/utils/UrlUtils.java
+++ b/flutter-idea/src/io/flutter/utils/UrlUtils.java
@@ -1,7 +1,7 @@
 package io.flutter.utils;
 
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 
 public class UrlUtils {
     public static String generateHtmlFragmentWithHrefTags(String input) {
@@ -11,9 +11,10 @@ public static String generateHtmlFragmentWithHrefTags(String input) {
                 builder.append(" ");
             }
             try {
-                URL url = new URL(token);
-                builder.append("<a href=\"").append(url).append("\">").append(url).append("</a>");
-            } catch(MalformedURLException e) {
+                final URI uri = new URI(token);
+                builder.append("<a href=\"").append(uri).append("\">").append(uri).append("</a>");
+            }
+            catch (URISyntaxException e) {
                 builder.append(token);
             }
         }