diff --git a/Robust.Shared/GameObjects/EntitySystem.Resolve.cs b/Robust.Shared/GameObjects/EntitySystem.Resolve.cs
index cfc5f317e..21e8ea52e 100644
--- a/Robust.Shared/GameObjects/EntitySystem.Resolve.cs
+++ b/Robust.Shared/GameObjects/EntitySystem.Resolve.cs
@@ -29,7 +29,7 @@ namespace Robust.Shared.GameObjects
             var found = EntityManager.TryGetComponent(uid, out component);
 
             if(logMissing && !found)
-                Logger.ErrorS("resolve", $"Can't resolve \"{typeof(TComp)}\" on entity {uid}!\n{new StackTrace(1, true)}");
+                Logger.ErrorS("resolve", $"Can't resolve \"{typeof(TComp)}\" on entity {ToPrettyString(uid)}!\n{new StackTrace(1, true)}");
 
             return found;
         }
diff --git a/Robust.Shared/Map/MapSerializationContext.cs b/Robust.Shared/Map/MapSerializationContext.cs
index f0ef4f2bc..7d06864f4 100644
--- a/Robust.Shared/Map/MapSerializationContext.cs
+++ b/Robust.Shared/Map/MapSerializationContext.cs
@@ -95,7 +95,7 @@ internal sealed class MapSerializationContext : ISerializationContext, IEntityLo
         if (!_entityUidMap.TryGetValue(value, out var entityUidMapped))
         {
             // Terrible hack to mute this error on the grids themselves when serializing blueprints.
-            if (value.IsValid() || CurrentWritingComponent != "Transform")
+            if (!value.IsValid() && CurrentWritingComponent != "Transform")
             {
                 Logger.ErrorS("map", "Encountered an invalid entityUid '{0}' while serializing a map.", value);
             }