diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index b066cefd1..5c97ba87a 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -74,6 +74,7 @@ except Exception:
 class ConnectionBytestream:
 	def __init__(self):
 		self.files_props = {}
+		self.awaiting_xmpp_ping_id = None
 
 	def is_transfer_stopped(self, file_props):
 		if 'error' in file_props and file_props['error'] != 0:
@@ -1387,6 +1388,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 		self.version_ids = []
 		# ID of urn:xmpp:ping requests
 		self.awaiting_xmpp_ping_id = None
+		self.continue_connect_info = None
 
 		try:
 			idle.init()
diff --git a/src/disco.py b/src/disco.py
index 944c0fc0e..75361caa5 100644
--- a/src/disco.py
+++ b/src/disco.py
@@ -432,6 +432,7 @@ class ServiceDiscoveryWindow(object):
 		self.browser = None
 		self.children = []
 		self.dying = False
+		self.node = None
 
 		# Check connection
 		if gajim.connections[account].connected < 2: