From ca90656fba992a41a55ad4ed595e9c9bbe58d491 Mon Sep 17 00:00:00 2001
From: Dan Rubel <danrubel@google.com>
Date: Thu, 27 Oct 2016 09:14:41 +0100
Subject: [PATCH] catch VMService connection exception (#6526)

---
 packages/flutter_tools/lib/src/vmservice.dart | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/flutter_tools/lib/src/vmservice.dart b/packages/flutter_tools/lib/src/vmservice.dart
index 30cd65c34bf..2940ac4b221 100644
--- a/packages/flutter_tools/lib/src/vmservice.dart
+++ b/packages/flutter_tools/lib/src/vmservice.dart
@@ -25,7 +25,12 @@ class VMService {
   /// Connect to '127.0.0.1' at [port].
   static Future<VMService> connect(int port) async {
     Uri uri = new Uri(scheme: 'ws', host: '127.0.0.1', port: port, path: 'ws');
-    WebSocket ws = await WebSocket.connect(uri.toString());
+    WebSocket ws;
+    try {
+      ws = await WebSocket.connect(uri.toString());
+    } catch (e) {
+      return new Future<VMService>.error('Failed to connect to $uri\n  $e');
+    }
     rpc.Peer peer = new rpc.Peer(new IOWebSocketChannel(ws).cast());
     peer.listen();
     Uri httpAddress = new Uri(scheme: 'http', host: '127.0.0.1', port: port);