diff --git a/src/xpra/net/subprocess_wrapper.py b/src/xpra/net/subprocess_wrapper.py
index 02e7225d79..2af42a6671 100644
--- a/src/xpra/net/subprocess_wrapper.py
+++ b/src/xpra/net/subprocess_wrapper.py
@@ -44,7 +44,7 @@
 #        gtk.main()
 #    def quit(self):
 #        gtk.main_quit()
-mainloop = gobject.mainloop
+mainloop = gobject.MainLoop
 
 
 class subprocess_callee(object):
@@ -288,9 +288,9 @@ def stop(self):
                 log.warn("failed to stop the wrapped subprocess %s: %s", proc, e)
         p = self.protocol
         if p:
+            self.protocol = None
             try:
                 p.close()
-                self.protocol = None
             except Exception as e:
                 log.warn("failed to close the subprocess connection: %s", p, e)