diff --git a/spine-cpp/spine-cpp/include/spine/AnimationState.h b/spine-cpp/spine-cpp/include/spine/AnimationState.h
index 8f165da52..300edf0a3 100644
--- a/spine-cpp/spine-cpp/include/spine/AnimationState.h
+++ b/spine-cpp/spine-cpp/include/spine/AnimationState.h
@@ -387,6 +387,14 @@ namespace spine {
 		void enableQueue();
 
 	private:
+		static const int Subsequent = 0;
+		static const int First = 1;
+		static const int HoldSubsequent = 2;
+		static const int HoldFirst = 3;
+		static const int HoldMix = 4;
+
+		static const int Setup = 1;
+		static const int Current = 2;
 
 		AnimationStateData* _data;
 
diff --git a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp b/spine-cpp/spine-cpp/src/spine/AnimationState.cpp
index 5980ea72b..6185b8855 100644
--- a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp
+++ b/spine-cpp/spine-cpp/src/spine/AnimationState.cpp
@@ -288,15 +288,6 @@ void EventQueue::drain() {
 	_drainDisabled = false;
 }
 
-const int Subsequent = 0;
-const int First = 1;
-const int HoldSubsequent = 2;
-const int HoldFirst = 3;
-const int HoldMix = 4;
-
-const int Setup = 1;
-const int Current = 2;
-
 AnimationState::AnimationState(AnimationStateData *data) :
 		_data(data),
 		_queue(EventQueue::newEventQueue(*this, _trackEntryPool)),
diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonAnimationInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonAnimationInspector.cs
index 75f3e2966..c33232442 100644
--- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonAnimationInspector.cs
+++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonAnimationInspector.cs
@@ -90,7 +90,7 @@ namespace Spine.Unity.Editor {
 
 		protected void TrySetAnimation (SkeletonAnimation skeletonAnimation) {
 			if (skeletonAnimation == null) return;
-			if (!skeletonAnimation.valid)
+			if (!skeletonAnimation.valid || skeletonAnimation.AnimationState == null)
 				return;
 
 			TrackEntry current = skeletonAnimation.AnimationState.GetCurrent(0);