diff --git a/bin/pyghmicons b/bin/pyghmicons
index 6c877cb..aca9b55 100755
--- a/bin/pyghmicons
+++ b/bin/pyghmicons
@@ -78,7 +78,7 @@ try:
     inputthread.daemon = True
     inputthread.start()
     sol.main_loop()
-except:
+except Exception:
     currfl = fcntl.fcntl(sys.stdin.fileno(), fcntl.F_GETFL)
     fcntl.fcntl(sys.stdin.fileno(), fcntl.F_SETFL, currfl ^ os.O_NONBLOCK)
     termios.tcsetattr(sys.stdin, termios.TCSANOW, tcattr)
diff --git a/tox.ini b/tox.ini
index 4ce9f7f..9a7015c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,8 @@ sitepackages = True
 downloadcache = ~/cache/pip
 
 [testenv:pep8]
-commands = flake8
+whitelist_externals = bash
+commands = bash -c 'flake8 pyghmi bin/*'
 
 [testenv:cover]
 setenv = VIRTUAL_ENV={envdir}