cleanup

tools/client.py

@@ -27,7 +27,7 @@ class Client(object):
             # found.
             if client_data is None:
                 raise StorageNotFound('Client not found')
-
+        else:
             # Next try to get an existing client by IP and protocol
             self.ip_address = kw.pop('ip_address')
             self.protocol = kw.pop('protocol')
@@ -42,6 +42,8 @@ class Client(object):
             self.load_client(client_data)
         else:
             self.client_id = str(uuid4())
+            self.ip_address = kw.pop('ip_address')
+            self.protocol = kw.pop('protocol')
             self.created = datetime.now()
             self.enabled = False
             self.last_packets = 0