diff --git a/Subsurface/Source/GameSession/CrewManager.cs b/Subsurface/Source/GameSession/CrewManager.cs
index 57f43cabe..bc5dbef82 100644
--- a/Subsurface/Source/GameSession/CrewManager.cs
+++ b/Subsurface/Source/GameSession/CrewManager.cs
@@ -250,6 +250,8 @@ namespace Barotrauma
 
         protected virtual bool SelectCrewCharacter(Character character, GUIComponent crewList)
         {
+            if (character == null) return false;
+
             GUIComponent existingFrame = crewList.Parent.FindChild("selectedcharacter");
             if (existingFrame != null) crewList.Parent.RemoveChild(existingFrame);
 
diff --git a/Subsurface/Source/Networking/GameClient.cs b/Subsurface/Source/Networking/GameClient.cs
index d87d9aaa3..e04a4c2cc 100644
--- a/Subsurface/Source/Networking/GameClient.cs
+++ b/Subsurface/Source/Networking/GameClient.cs
@@ -1147,7 +1147,7 @@ namespace Barotrauma.Networking
             client.Shutdown("");
             GameMain.NetworkMember = null;
         }
-
+        
         public void WriteCharacterInfo(NetOutgoingMessage msg)
         {
             if (characterInfo == null) return;