diff --git a/Barotrauma/BarotraumaClient/Source/Characters/CharacterInfo.cs b/Barotrauma/BarotraumaClient/Source/Characters/CharacterInfo.cs
index a4eb436a9..e01a3dd2b 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/CharacterInfo.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/CharacterInfo.cs
@@ -241,10 +241,12 @@ namespace Barotrauma
             if (!string.IsNullOrEmpty(jobIdentifier))
             {
                 jobPrefab = JobPrefab.List.Find(jp => jp.Identifier == jobIdentifier);
-                for (int i = 0; i < jobPrefab.Skills.Count; i++)
+                byte skillCount = inc.ReadByte();
+                for (int i = 0; i < skillCount; i++)
                 {
+                    string skillIdentifier = inc.ReadString();
                     float skillLevel = inc.ReadSingle();
-                    skillLevels.Add(jobPrefab.Skills[i].Identifier, skillLevel);
+                    skillLevels.Add(skillIdentifier, skillLevel);
                 }
             }
 
@@ -254,7 +256,6 @@ namespace Barotrauma
                 ID = infoID,
             };
             ch.RecreateHead(headSpriteID,(Race)race, (Gender)gender, hairIndex, beardIndex, moustacheIndex, faceAttachmentIndex);
-            System.Diagnostics.Debug.Assert(skillLevels.Count == ch.Job.Skills.Count);
             if (ch.Job != null)
             {
                 foreach (KeyValuePair<string, float> skill in skillLevels)
@@ -262,11 +263,12 @@ namespace Barotrauma
                     Skill matchingSkill = ch.Job.Skills.Find(s => s.Identifier == skill.Key);
                     if (matchingSkill == null)
                     {
-                        DebugConsole.ThrowError("Skill \"" + skill.Key + "\" not found in character \"" + newName + "\"");
+                        ch.Job.Skills.Add(new Skill(skill.Key, skill.Value));
                         continue;
                     }
                     matchingSkill.Level = skill.Value;
                 }
+                ch.Job.Skills.RemoveAll(s => !skillLevels.ContainsKey(s.Identifier));
             }
             return ch;
         }
diff --git a/Barotrauma/BarotraumaServer/Source/Characters/CharacterInfo.cs b/Barotrauma/BarotraumaServer/Source/Characters/CharacterInfo.cs
index 29f5bade5..8a75d42e0 100644
--- a/Barotrauma/BarotraumaServer/Source/Characters/CharacterInfo.cs
+++ b/Barotrauma/BarotraumaServer/Source/Characters/CharacterInfo.cs
@@ -20,8 +20,10 @@ namespace Barotrauma
             if (Job != null)
             {
                 msg.Write(Job.Prefab.Identifier);
+                msg.Write((byte)Job.Skills.Count);
                 foreach (Skill skill in Job.Skills)
                 {
+                    msg.Write(skill.Identifier);
                     msg.Write(skill.Level);
                 }
             }