diff --git a/src/allmydata/scripts/tahoe_run.py b/src/allmydata/scripts/tahoe_run.py
index a5b833233..7722fef51 100644
--- a/src/allmydata/scripts/tahoe_run.py
+++ b/src/allmydata/scripts/tahoe_run.py
@@ -266,7 +266,7 @@ def run(reactor, config, runApp=twistd.runApp):
     pidfile = FilePath(get_pidfile(config['basedir']))
     try:
         check_pid_process(pidfile)
-    except ProcessInTheWay as e:
+    except (ProcessInTheWay, InvalidPidFile) as e:
         print("ERROR: {}".format(e))
         return 1
     else:
diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py
index 9b6357f46..14d0dfb7f 100644
--- a/src/allmydata/test/test_runner.py
+++ b/src/allmydata/test/test_runner.py
@@ -47,9 +47,6 @@ from twisted.internet.defer import (
     DeferredList,
 )
 from twisted.python.filepath import FilePath
-from twisted.python.runtime import (
-    platform,
-)
 from allmydata.util import fileutil, pollmixin
 from allmydata.util.encodingutil import unicode_to_argv
 from allmydata.test import common_util