diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs
index a47d065e6..812d38f89 100644
--- a/Assets/Scripts/Gameplay/ActionGameManager.cs
+++ b/Assets/Scripts/Gameplay/ActionGameManager.cs
@@ -839,7 +839,7 @@ public class ActionGameManager : MonoBehaviour
         {
             foreach (var entity in Zone.Entities.ToArray())
             {
-                if (lengthsq(entity.Position.xz - CurrentEntity.Position.xz) <
+                if (entity != CurrentEntity && lengthsq(entity.Position.xz - CurrentEntity.Position.xz) <
                     Settings.GameplaySettings.DockingDistance * Settings.GameplaySettings.DockingDistance)
                 {
                     var bay = entity.TryDock(ship);
diff --git a/Assets/Scripts/ServerShared/Entity.cs b/Assets/Scripts/ServerShared/Entity.cs
index 87c15d448..d9ab1be46 100644
--- a/Assets/Scripts/ServerShared/Entity.cs
+++ b/Assets/Scripts/ServerShared/Entity.cs
@@ -288,9 +288,15 @@ public abstract class Entity
     }
 
     // TODO: Inter-faction relationships
-    public FactionRelationship GetFactionRelationship(Faction faction) => 
-        this is Ship {IsPlayerShip: true} ? Zone.Sector.FactionRelationships[faction] : faction==Faction ? FactionRelationship.Beloved : FactionRelationship.Neutral;
-    
+    public FactionRelationship GetFactionRelationship(Faction faction)
+    {
+        if (faction == null)
+            return FactionRelationship.Neutral;
+        if (this is Ship {IsPlayerShip: true})
+            return Zone.Sector.FactionRelationships[faction];
+        return faction.ID == Faction.ID ? FactionRelationship.Beloved : FactionRelationship.Neutral;
+    }
+
     public static bool IsPresencePermitted(FactionRelationship relationship, SecurityLevel securityLevel) => 
         (int) relationship - (int) securityLevel > 0;
     public static bool IsDockingPermitted(FactionRelationship relationship, SecurityLevel securityLevel) => 
diff --git a/GameData/PlayerSettings.msgpack b/GameData/PlayerSettings.msgpack
index d28ebe819..d1dca8589 100644
--- a/GameData/PlayerSettings.msgpack
+++ b/GameData/PlayerSettings.msgpack
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2014d1c1c2b07e355c78b5d8699bdb7e0a15d4638522322d86744db6fd5018f5
-size 83737
+oid sha256:b324383d98b74ff9002bda4f3621d3a0fa92e3d73177931519465dcd9fc777f0
+size 15954