diff --git a/management/daemon.py b/management/daemon.py
index 334749e4..572b6b4a 100755
--- a/management/daemon.py
+++ b/management/daemon.py
@@ -572,7 +572,7 @@ def munin_cgi(filename):
 
 	if code != 0:
 		# nonzero returncode indicates error
-		app.logger.error("munin_cgi: munin-cgi-graph returned nonzero exit code, %s", process.returncode)
+		app.logger.error("munin_cgi: munin-cgi-graph returned nonzero exit code, %s", code)
 		return ("error processing graph image", 500)
 
 	# /usr/lib/munin/cgi/munin-cgi-graph returns both headers and binary png when successful.
diff --git a/tests/tls.py b/tests/tls.py
index 32148133..0c7b945a 100644
--- a/tests/tls.py
+++ b/tests/tls.py
@@ -128,7 +128,7 @@ def sslyze(opts, port, ok_ciphers):
 			proxy_proc.terminate()
 			try:
 				proxy_proc.wait(5)
-			except TimeoutExpired:
+			except subprocess.TimeoutExpired:
 				proxy_proc.kill()
 
 # Get a list of OpenSSL cipher names.