diff --git a/osquery/management.py b/osquery/management.py
index 74ead81..891039e 100644
--- a/osquery/management.py
+++ b/osquery/management.py
@@ -192,12 +192,21 @@ def start_watcher(client, interval):
         while True:
             status = client.extension_manager_client().ping()
             if status.code != 0:
+                logging.error("Ping received nonzero status: %d", status)
                 break
             time.sleep(interval)
-    except socket.error:
-        # The socket was torn down.
-        pass
-    os._exit(0)
+
+    except socket.error as e:
+        logging.error("Ping received socket.error: %s", e)
+
+    except TTransport.TTransportException as e:
+        logging.error("Ping received thrift.transport.TTransport.TTransportException: %s", e)
+
+    except Exception as e:
+        logging.error("Ping received unknown exception: %s", e)
+
+    finally:
+        os._exit(1)
 
 
 def start_extension(name="<unknown>",