diff --git a/mROA/Implementation/Frontend/NetworkFrontendBridge.cs b/mROA/Implementation/Frontend/NetworkFrontendBridge.cs
index 97bba05..2d0ece6 100644
--- a/mROA/Implementation/Frontend/NetworkFrontendBridge.cs
+++ b/mROA/Implementation/Frontend/NetworkFrontendBridge.cs
@@ -47,16 +47,17 @@ namespace mROA.Implementation.Frontend
             {
                 Reconnect();
             };
-            _ = _interactionModule.PostMessageAsync(new NetworkMessageHeader(_serialization, new ClientConnect()));
-            var welcomeMessage = _interactionModule.GetNextMessageReceiving().GetAwaiter().GetResult();
-            if (welcomeMessage.MessageType != EMessageType.IdAssigning)
+            
+            _interactionModule.PostMessageAsync(new NetworkMessageHeader(_serialization, new ClientConnect())).Wait();
+            var idMessage = _interactionModule.GetNextMessageReceiving(false).GetAwaiter().GetResult();
+            if (idMessage.MessageType != EMessageType.IdAssigning)
             {
                 throw new Exception(
-                    $"Incorrect message type. Must be IdAssigning, current : {welcomeMessage.MessageType.ToString()}");
+                    $"Incorrect message type. Must be IdAssigning, current : {idMessage.MessageType.ToString()}");
             }
 
 
-            var assignment = _serialization.Deserialize<IdAssignment>(welcomeMessage.Data)!;
+            var assignment = _serialization.Deserialize<IdAssignment>(idMessage.Data)!;
             _interactionModule.ConnectionId = -assignment.Id;
             TransmissionConfig.OwnershipRepository = new StaticOwnershipRepository(assignment.Id);
         }
diff --git a/mROA/Implementation/NextGenerationInteractionModule.cs b/mROA/Implementation/NextGenerationInteractionModule.cs
index 8565d65..16c200d 100644
--- a/mROA/Implementation/NextGenerationInteractionModule.cs
+++ b/mROA/Implementation/NextGenerationInteractionModule.cs
@@ -26,7 +26,11 @@ namespace mROA.Implementation
         }
 
         public int ConnectionId { get; set; }
-        public Stream? BaseStream { get; set; }
+
+        public Stream? BaseStream
+        {
+            get => _baseStream; set => _baseStream = value;
+        }
 
 
         public void Inject<T>(T dependency)