diff --git a/app/src/bridge/index.ts b/app/src/bridge/index.ts
index fd71643..ae9d025 100755
--- a/app/src/bridge/index.ts
+++ b/app/src/bridge/index.ts
@@ -44,13 +44,9 @@ const decodeTransform = new DecodeTransform();
 const encodeTransform = new EncodeTransform();
 
 // stdin -> stdout
-process.stdin
-    .pipe(decodeTransform)
-
+process.stdin.pipe(decodeTransform)
 decodeTransform.on("data", handleMessage);
-
-encodeTransform
-    .pipe(process.stdout);
+encodeTransform.pipe(process.stdout);
 
 /**
  * Encode and send a message to the extension. If message is
diff --git a/ext/src/main.ts b/ext/src/main.ts
index d1e642f..ad57ca0 100755
--- a/ext/src/main.ts
+++ b/ext/src/main.ts
@@ -1,7 +1,6 @@
 "use strict";
 
 import defaultOptions from "./defaultOptions";
-import bridge from "./lib/bridge";
 import loadSender from "./lib/loadSender";
 import options, { Options } from "./lib/options";
 
@@ -13,8 +12,7 @@ import { Message } from "./types";
 import { CAST_FRAMEWORK_LOADER_SCRIPT_URL
        , CAST_LOADER_SCRIPT_URL } from "./lib/endpoints";
 
-import { ReceiverSelection
-       , ReceiverSelectorMediaType } from "./background/receiverSelector";
+import { ReceiverSelectorMediaType } from "./background/receiverSelector";
 
 import ReceiverSelectorManager
         from "./background/receiverSelector/ReceiverSelectorManager";
@@ -73,11 +71,13 @@ function initBrowserAction () {
     browser.browserAction.onClicked.addListener(async tab => {
         const selection = await ReceiverSelectorManager.getSelection();
 
-        loadSender({
-            tabId: tab.id
-          , frameId: 0
-          , selection
-        });
+        if (selection) {
+            loadSender({
+                tabId: tab.id
+              , frameId: 0
+              , selection
+            });
+        }
     });
 }