diff --git a/src/common/connection.py b/src/common/connection.py
index f6f366143377ef8c828e7a76d9beb469fd79bd4a..ba6340aba169c2767490fdeffa9cb6419c1c03df 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -501,6 +501,7 @@ class Connection:
 		listener = gajim.socks5queue.start_listener(self.peerhost[0], port, 
 			sha_str, self.result_socks5_sid, file_props['sid'])
 		if listener == None:
+			# FIXME - raise error dialog that address is in use
 			return
 		iq = common.xmpp.Protocol(name = 'iq', to = str(file_props['receiver']), 
 			typ = 'set')
diff --git a/src/common/socks5.py b/src/common/socks5.py
index 099e2616022b692ed6eb23ddbf7f032333bb3c19..d292f70d04c9aafee7057a05aa6842c9b4a8ae14 100644
--- a/src/common/socks5.py
+++ b/src/common/socks5.py
@@ -89,8 +89,8 @@ class SocksQueue:
 	def get_file_props(self, account, sid):
 		if self.files_props.has_key(account):
 			fl_props = self.files_props[account]
-			if fl_props.has_key(id):
-				return fl_props[id]
+			if fl_props.has_key(sid):
+				return fl_props[sid]
 		return None
 
 	def process(self, timeout=0):
@@ -436,7 +436,7 @@ class Socks5Listener:
 			self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 			self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
 			self._serv.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-			self._serv.bind((self.host, self.port))
+			self._serv.bind(('0.0.0.0', self.port))
 			self._serv.listen(socket.SOMAXCONN)
 		except Exception, (errno, errstr):
 			return None