diff --git a/xpra/os_util.py b/xpra/os_util.py
index 56f9dd95ed..08c31e8b42 100644
--- a/xpra/os_util.py
+++ b/xpra/os_util.py
@@ -80,8 +80,8 @@ def nn(x):
                 continue
             #sanitize stack to prevent None values (which cause encoding errors with the bencoder)
             sanestack = []
-            for e in stack:
-                sanestack.append(tuple(nn(x) for x in e))
+            for entry in stack:
+                sanestack.append(tuple(nn(x) for x in entry))
             info[i] = {
                 ""          : tident,
                 "stack"     : sanestack,
diff --git a/xpra/scripts/server.py b/xpra/scripts/server.py
index c671108cb3..e89f9d26b0 100644
--- a/xpra/scripts/server.py
+++ b/xpra/scripts/server.py
@@ -1525,7 +1525,6 @@ def server_not_started(msg="server not started"):
     ######################################################################
     if opts.attach is True:
         attach_client(opts, defaults)
-    del opts
 
     try:
         progress(100, "running")