diff --git a/gamespy/gs_query.py b/gamespy/gs_query.py
index 885af5f..8b1891c 100644
--- a/gamespy/gs_query.py
+++ b/gamespy/gs_query.py
@@ -50,7 +50,7 @@ def parse_gamespy_message(message):
                 messages['__cmd_val__'] = value
                 found_command = True
 
-            messages[key] = value
+            messages[key] = value.rstrip('\x00')
 
         stack.append(messages)
         messages = {}
diff --git a/gamespy_qr_server.py b/gamespy_qr_server.py
index bbfbb06..f37fec4 100644
--- a/gamespy_qr_server.py
+++ b/gamespy_qr_server.py
@@ -403,7 +403,7 @@ class GameSpyQRServer(object):
             if delta < 0 or delta >= timeout:
                 pruned.append(session_id)
                 self.server_manager.delete_server(self.sessions[session_id].gamename, self.sessions[session_id].session)
-                self.log(logging.DEBUG, None, "Keep alive check removed %s:%s for game %s. Client hasn't responded in %d seconds." % (self.sessions[session_id].address[0], self.sessions[session_id].address[1], self.sessions[session_id].gamename, delta))
+                self.log(logging.DEBUG, None, session_id, "Keep alive check removed %s:%s for game %s. Client hasn't responded in %d seconds." % (self.sessions[session_id].address[0], self.sessions[session_id].address[1], self.sessions[session_id].gamename, delta))
 
         for session_id in pruned:
             del self.sessions[session_id]