diff --git a/src/OSC/OSCPacket.cs b/src/OSC/OSCPacket.cs
index aa33d03..4e8922b 100644
--- a/src/OSC/OSCPacket.cs
+++ b/src/OSC/OSCPacket.cs
@@ -48,7 +48,7 @@ public string Address
 			}
 			set
 			{
-				Trace.Assert(string.IsNullOrEmpty(_address) == false);
+				Trace.Assert(string.IsNullOrEmpty(value) == false);
 				_address = value;
 			}
 		}
diff --git a/src/OSCHandler.cs b/src/OSCHandler.cs
index e4cb3ce..9b4a24c 100644
--- a/src/OSCHandler.cs
+++ b/src/OSCHandler.cs
@@ -157,6 +157,9 @@ void OnApplicationQuit()
 	/// </param>
 	public void CreateClient(string clientId, IPAddress destination, int port)
 	{
+		if (_clients.ContainsKey(clientId)) {
+			return;
+		}
 		ClientLog clientitem = new ClientLog();
 		clientitem.client = new OSCClient(destination, port);
 		clientitem.log = new List<string>();