diff --git a/pwatch.py b/pwatch.py
index f6c1189..ddd14b2 100755
--- a/pwatch.py
+++ b/pwatch.py
@@ -89,6 +89,8 @@ class UnixWatchCommand:
         retcode = process.poll()
 
         if retcode:
+                self.stop.set()
+                self.restoreScreen()
                 raise subprocess.CalledProcessError(retcode, command,
                                                     output=output[0])
         return output.splitlines()