diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 75d314b38..4bb3c7eb8 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -1857,8 +1857,8 @@ bool Creature::LoadCreatureAddon(bool reload)
     // 1 UnitPVPStateFlags  Set at Creature::UpdateEntry (SetPvp())
     // 2 UnitRename         Pet only, so always 0 for default creature
     // 3 ShapeshiftForm     Must be determined/set by shapeshift spell/aura
-    if (cainfo->stash != 0)
-        SetByteValue(UNIT_FIELD_BYTES_2, 0, cainfo->stash);
+    if (cainfo->sheath_state != 0)
+        SetByteValue(UNIT_FIELD_BYTES_2, 0, cainfo->sheath_state);
 
     if (cainfo->pvp_state != 0)
         SetByteValue(UNIT_FIELD_BYTES_2, 1, cainfo->pvp_state);
diff --git a/src/game/Creature.h b/src/game/Creature.h
index 70200da11..9d3118126 100644
--- a/src/game/Creature.h
+++ b/src/game/Creature.h
@@ -203,7 +203,7 @@ struct CreatureDataAddon
     uint32 guidOrEntry;
     uint32 mount;
     uint32 bytes1;
-    uint8  stash;                                           // SheathState
+    uint8  sheath_state;                                    // SheathState
     uint8  pvp_state;                                       // UnitPVPStateFlags
     uint32 emote;
     uint32 splineFlags;
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 462c67333..3fca07baf 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -853,6 +853,9 @@ void ObjectMgr::LoadCreatureAddons(SQLStorage& creatureaddons, char const* entry
             }
         }
 
+        if (addon->sheath_state > SHEATH_STATE_RANGED)
+            sLog.outErrorDb("Creature (%s %u) has unknown sheath state (%u) defined in `%s`.", entryName, addon->guidOrEntry, addon->sheath_state, creatureaddons.GetTableName());
+
         if (!sEmotesStore.LookupEntry(addon->emote))
         {
             sLog.outErrorDb("Creature (%s %u) have invalid emote (%u) defined in `%s`.", entryName, addon->guidOrEntry, addon->emote, creatureaddons.GetTableName());
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 3f946f1a5..a88863c9f 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10796"
+ #define REVISION_NR "10797"
 #endif // __REVISION_NR_H__