diff --git a/lib/page_session.ex b/lib/page_session.ex
index c39ad67..4b9bece 100644
--- a/lib/page_session.ex
+++ b/lib/page_session.ex
@@ -119,6 +119,7 @@ defmodule ChromeRemoteInterface.PageSession do
   # ---
 
   def init(url) do
+    Process.flag(:trap_exit, true)
     {:ok, socket} = ChromeRemoteInterface.Websocket.start_link(url)
 
     state = %__MODULE__{
@@ -282,8 +283,16 @@ defmodule ChromeRemoteInterface.PageSession do
     |> Enum.each(&send(&1, event))
   end
 
-  def terminate(_reason, state) do
-    Process.exit(state.socket, :kill)
+  # handle the trapped exit call
+  def handle_info({:EXIT, from, reason}, %{socket: socket} = state) do
+    cleanup(reason, state)
+    {:stop, reason, state} # see GenServer docs for other return types
+  end
+
+  def terminate(reason, state) do
+    cleanup(reason, state)
     :stop
   end
+
+  def cleanup(reason, state), do: Process.exit(state.socket, reason)
 end
diff --git a/lib/websocket.ex b/lib/websocket.ex
index dd089c1..5586d06 100644
--- a/lib/websocket.ex
+++ b/lib/websocket.ex
@@ -11,4 +11,13 @@ defmodule ChromeRemoteInterface.Websocket do
     send(state, {:message, frame_data})
     {:ok, state}
   end
+
+  def handle_disconnect(_status, state) do
+    Process.exit(state, :remote_closed)
+    {:ok, state}
+  end
+
+  def terminate({:remote, :closed}, _state) do
+    :stop
+  end
 end