From 9b66fea2ea746f53bb97bd9b6facf072cefb2f19 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Tue, 6 Nov 2018 08:37:53 -0800
Subject: [PATCH] Follow up to https://github.com/flutter/flutter/pull/23436
 (#23876)

---
 .../flutter_tools/lib/src/commands/attach.dart | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/flutter_tools/lib/src/commands/attach.dart b/packages/flutter_tools/lib/src/commands/attach.dart
index 7c900f42778..dc52a6cfdbb 100644
--- a/packages/flutter_tools/lib/src/commands/attach.dart
+++ b/packages/flutter_tools/lib/src/commands/attach.dart
@@ -141,15 +141,19 @@ class AttachCommand extends FlutterCommand {
           'Waiting for a connection from Flutter on ${device.name}...',
           expectSlowOperation: true,
         );
-        final int localPort = await device.findIsolatePort(module, localPorts);
-        if (localPort == null) {
+        try {
+          final int localPort = await device.findIsolatePort(module, localPorts);
+          if (localPort == null) {
+            throwToolExit('No active Observatory running module \'$module\' on ${device.name}');
+          }
+          observatoryUri = ipv6
+            ? Uri.parse('http://[$ipv6Loopback]:$localPort/')
+            : Uri.parse('http://$ipv4Loopback:$localPort/');
+          status.stop();
+        } catch (_) {
           status.cancel();
-          throwToolExit('No active Observatory running module \'$module\' on ${device.name}');
+          rethrow;
         }
-        status.stop();
-        observatoryUri = ipv6
-          ? Uri.parse('http://[$ipv6Loopback]:$localPort/')
-          : Uri.parse('http://$ipv4Loopback:$localPort/');
       } else {
         ProtocolDiscovery observatoryDiscovery;
         try {