diff --git a/Source/Game/AI/SmartScripts/SmartAI.cs b/Source/Game/AI/SmartScripts/SmartAI.cs
index b1f1d0460..09c241a35 100644
--- a/Source/Game/AI/SmartScripts/SmartAI.cs
+++ b/Source/Game/AI/SmartScripts/SmartAI.cs
@@ -975,7 +975,7 @@ namespace Game.AI
         bool mForcedPaused;
         uint mInvincibilityHpLevel;
 
-        WaypointPath _path;
+        WaypointPath _path = new WaypointPath();
         uint mDespawnTime;
         uint mRespawnTime;
         uint mDespawnState;
diff --git a/Source/Game/Maps/Map.cs b/Source/Game/Maps/Map.cs
index 63d575c36..1111978d6 100644
--- a/Source/Game/Maps/Map.cs
+++ b/Source/Game/Maps/Map.cs
@@ -3094,7 +3094,7 @@ namespace Game.Maps
 
         public GameObject GetGameObject(ObjectGuid guid)
         {
-            if (!guid.IsGameObject())
+            if (!guid.IsAnyTypeGameObject())
                 return null;
 
             return (GameObject)_objectsStore.LookupByKey(guid);