diff --git a/src/FsmUtil.cs b/src/FsmUtil.cs
index 3d4215e..db65e0e 100644
--- a/src/FsmUtil.cs
+++ b/src/FsmUtil.cs
@@ -115,6 +115,35 @@ private static TVal[] GetItemsFromArray<TVal>(TVal[] origArray, Func<TVal, bool>
     [PublicAPI]
     public static FsmState? GetState(this Fsm fsm, string stateName) => GetItemFromArray(fsm.States, x => x.Name == stateName);
 
+    /// <summary>
+    ///     Gets a state in a PlayMakerFSM, throwing an exception if it is not found.
+    /// </summary>
+    /// <param name="fsm">The fsm</param>
+    /// <param name="stateName">The name of the state</param>
+    /// <returns>The found state.</returns>
+    [PublicAPI]
+    public static FsmState MustGetState(this PlayMakerFSM fsm, string stateName)
+    {
+        var s = fsm.GetState(stateName);
+        if (s == null)
+        {
+            throw new InvalidOperationException($"State {stateName} not found in FSM {fsm.FsmName}");
+        }
+        return s;
+    }
+
+    /// <inheritdoc cref="MustGetState(PlayMakerFSM, string)"/>
+    [PublicAPI]
+    public static FsmState MustGetState(this Fsm fsm, string stateName)
+    {
+        var s = fsm.GetState(stateName);
+        if (s == null)
+        {
+            throw new InvalidOperationException($"State {stateName} not found in FSM {fsm.Name}");
+        }
+        return s;
+    }
+
     /// <summary>
     ///     Gets a transition in a PlayMakerFSM.
     /// </summary>
@@ -123,11 +152,11 @@ private static TVal[] GetItemsFromArray<TVal>(TVal[] origArray, Func<TVal, bool>
     /// <param name="eventName">The name of the event</param>
     /// <returns>The found transition, null if none are found</returns>
     [PublicAPI]
-    public static FsmTransition? GetTransition(this PlayMakerFSM fsm, string stateName, string eventName) => fsm.GetState(stateName)!.GetTransition(eventName);
+    public static FsmTransition? GetTransition(this PlayMakerFSM fsm, string stateName, string eventName) => fsm.MustGetState(stateName).GetTransition(eventName);
 
     /// <inheritdoc cref="GetTransition(PlayMakerFSM, string, string)"/>
     [PublicAPI]
-    public static FsmTransition? GetTransition(this Fsm fsm, string stateName, string eventName) => fsm.GetState(stateName)!.GetTransition(eventName);
+    public static FsmTransition? GetTransition(this Fsm fsm, string stateName, string eventName) => fsm.MustGetState(stateName).GetTransition(eventName);
 
     /// <inheritdoc cref="GetTransition(PlayMakerFSM, string, string)"/>
     /// <param name="state">The state</param>
@@ -157,11 +186,11 @@ private static TVal[] GetItemsFromArray<TVal>(TVal[] origArray, Func<TVal, bool>
     /// <param name="index">The index of the action</param>
     /// <returns>The action, null if it can't be found</returns>
     [PublicAPI]
-    public static TAction? GetAction<TAction>(this PlayMakerFSM fsm, string stateName, int index) where TAction : FsmStateAction => fsm.GetState(stateName)!.GetAction<TAction>(index);
+    public static TAction? GetAction<TAction>(this PlayMakerFSM fsm, string stateName, int index) where TAction : FsmStateAction => fsm.MustGetState(stateName).GetAction<TAction>(index);
 
     /// <inheritdoc cref="GetAction{TAction}(PlayMakerFSM, string, int)"/>
     [PublicAPI]
-    public static TAction? GetAction<TAction>(this Fsm fsm, string stateName, int index) where TAction : FsmStateAction => fsm.GetState(stateName)!.GetAction<TAction>(index);
+    public static TAction? GetAction<TAction>(this Fsm fsm, string stateName, int index) where TAction : FsmStateAction => fsm.MustGetState(stateName).GetAction<TAction>(index);
 
     /// <inheritdoc cref="GetAction{TAction}(PlayMakerFSM, string, int)"/>
     /// <param name="state">The state</param>
@@ -171,11 +200,11 @@ private static TVal[] GetItemsFromArray<TVal>(TVal[] origArray, Func<TVal, bool>
 
     /// <inheritdoc cref="GetAction{TAction}(PlayMakerFSM, string, int)"/>
     [PublicAPI]
-    public static FsmStateAction? GetStateAction(this PlayMakerFSM fsm, string stateName, int index) => fsm.GetState(stateName)!.GetStateAction(index);
+    public static FsmStateAction? GetStateAction(this PlayMakerFSM fsm, string stateName, int index) => fsm.MustGetState(stateName).GetStateAction(index);
 
     /// <inheritdoc cref="GetAction{TAction}(Fsm, string, int)"/>
     [PublicAPI]
-    public static FsmStateAction? GetStateAction(this Fsm fsm, string stateName, int index) => fsm.GetState(stateName)!.GetStateAction(index);
+    public static FsmStateAction? GetStateAction(this Fsm fsm, string stateName, int index) => fsm.MustGetState(stateName).GetStateAction(index);
 
     /// <inheritdoc cref="GetAction{TAction}(FsmState, int)"/>
     [PublicAPI]
@@ -189,11 +218,11 @@ private static TVal[] GetItemsFromArray<TVal>(TVal[] origArray, Func<TVal, bool>
     /// <param name="stateName">The name of the state</param>
     /// <returns>An array of actions</returns>
     [PublicAPI]
-    public static TAction[] GetActionsOfType<TAction>(this PlayMakerFSM fsm, string stateName) where TAction : FsmStateAction => fsm.GetState(stateName)!.GetActionsOfType<TAction>();
+    public static TAction[] GetActionsOfType<TAction>(this PlayMakerFSM fsm, string stateName) where TAction : FsmStateAction => fsm.MustGetState(stateName).GetActionsOfType<TAction>();
 
     /// <inheritdoc cref="GetActionsOfType{TAction}(PlayMakerFSM, string)"/>
     [PublicAPI]
-    public static TAction[] GetActionsOfType<TAction>(this Fsm fsm, string stateName) where TAction : FsmStateAction => fsm.GetState(stateName)!.GetActionsOfType<TAction>();
+    public static TAction[] GetActionsOfType<TAction>(this Fsm fsm, string stateName) where TAction : FsmStateAction => fsm.MustGetState(stateName).GetActionsOfType<TAction>();
 
     /// <inheritdoc cref="GetActionsOfType{TAction}(PlayMakerFSM, string)"/>
     /// <param name="state">The state</param>
@@ -207,26 +236,18 @@ private static TVal[] GetItemsFromArray<TVal>(TVal[] origArray, Func<TVal, bool>
     /// <param name="fsm">The fsm</param>
     /// <param name="stateName">The name of the state to get the actions from</param>
     [PublicAPI]
-    public static TAction? GetFirstActionOfType<TAction>(this PlayMakerFSM fsm, string stateName) where TAction : FsmStateAction => fsm.GetState(stateName)!.GetFirstActionOfType<TAction>();
+    public static TAction? GetFirstActionOfType<TAction>(this PlayMakerFSM fsm, string stateName) where TAction : FsmStateAction => fsm.MustGetState(stateName).GetFirstActionOfType<TAction>();
 
     /// <inheritdoc cref="GetFirstActionOfType{TAction}(PlayMakerFSM, string)"/>
     [PublicAPI]
-    public static TAction? GetFirstActionOfType<TAction>(this Fsm fsm, string stateName) where TAction : FsmStateAction => fsm.GetState(stateName)!.GetFirstActionOfType<TAction>();
+    public static TAction? GetFirstActionOfType<TAction>(this Fsm fsm, string stateName) where TAction : FsmStateAction => fsm.MustGetState(stateName).GetFirstActionOfType<TAction>();
 
     /// <inheritdoc cref="GetFirstActionOfType{TAction}(PlayMakerFSM, string)"/>
     /// <param name="state">The fsm state</param>
     [PublicAPI]
     public static TAction? GetFirstActionOfType<TAction>(this FsmState state) where TAction : FsmStateAction
     {
-        int firstActionIndex = -1;
-        for (int i = 0; i < state.Actions.Length; i++)
-        {
-            if (state.Actions[i] is TAction)
-            {
-                firstActionIndex = i;
-                break;
-            }
-        }
+        int firstActionIndex = state.IndexFirstActionOfType<TAction>();
 
         if (firstActionIndex == -1)
             return null;
@@ -240,26 +261,18 @@ private static TVal[] GetItemsFromArray<TVal>(TVal[] origArray, Func<TVal, bool>
     /// <param name="fsm">The fsm</param>
     /// <param name="stateName">The name of the state to get the actions from</param>
     [PublicAPI]
-    public static TAction? GetLastActionOfType<TAction>(this PlayMakerFSM fsm, string stateName) where TAction : FsmStateAction => fsm.GetState(stateName)!.GetLastActionOfType<TAction>();
+    public static TAction? GetLastActionOfType<TAction>(this PlayMakerFSM fsm, string stateName) where TAction : FsmStateAction => fsm.MustGetState(stateName).GetLastActionOfType<TAction>();
 
     /// <inheritdoc cref="GetLastActionOfType{TAction}(PlayMakerFSM, string)"/>
     [PublicAPI]
-    public static TAction? GetLastActionOfType<TAction>(this Fsm fsm, string stateName) where TAction : FsmStateAction => fsm.GetState(stateName)!.GetLastActionOfType<TAction>();
+    public static TAction? GetLastActionOfType<TAction>(this Fsm fsm, string stateName) where TAction : FsmStateAction => fsm.MustGetState(stateName).GetLastActionOfType<TAction>();
 
     /// <inheritdoc cref="GetLastActionOfType{TAction}(PlayMakerFSM, string)"/>
     /// <param name="state">The fsm state</param>
     [PublicAPI]
     public static TAction? GetLastActionOfType<TAction>(this FsmState state) where TAction : FsmStateAction
     {
-        int lastActionIndex = -1;
-        for (int i = state.Actions.Length - 1; i >= 0; i--)
-        {
-            if (state.Actions[i] is TAction)
-            {
-                lastActionIndex = i;
-                break;
-            }
-        }
+        int lastActionIndex = state.IndexLastActionOfType<TAction>();
 
         if (lastActionIndex == -1)
             return null;
@@ -268,6 +281,70 @@ private static TVal[] GetItemsFromArray<TVal>(TVal[] origArray, Func<TVal, bool>
 
     #endregion Get
 
+    #region Index
+
+    /// <summary>
+    ///     Finds the index of the first action in a state that matches the predicate.
+    /// </summary>
+    /// <param name="state">The state</param>
+    /// <param name="predicate">The predicate that each action is matched against</param>
+    /// <returns>The index of the matched action, or -1 if it was not found.</returns>
+    [PublicAPI]
+    public static int IndexFirstActionMatching(this FsmState state, Func<FsmStateAction, bool> predicate)
+    {
+        int n = state.actions.Length;
+        for (int i = 0; i < n; i++)
+        {
+            if (predicate(state.actions[i]))
+            {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    /// <summary>
+    ///     Finds the index of the last action in a state that matches the predicate.
+    /// </summary>
+    /// <param name="state">The state</param>
+    /// <param name="predicate">The predicate that each action is matched against</param>
+    /// <returns>The index of the matched action, or -1 if it was not found.</returns>
+    [PublicAPI]
+    public static int IndexLastActionMatching(this FsmState state, Func<FsmStateAction, bool> predicate)
+    {
+        int n = state.actions.Length;
+        for (int i = n - 1; i >= 0; i--)
+        {
+            if (predicate(state.actions[i]))
+            {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    /// <summary>
+    ///     Finds the index of the first action in a state that is of type <typeparamref name="T" />.
+    /// </summary>
+    /// <param name="state">The state</param>
+    /// <typeparam name="T">The type of action to look for</typeparam>
+    /// <returns>The index of the found action, or -1 if it was not found.</returns>
+    [PublicAPI]
+    public static int IndexFirstActionOfType<T>(this FsmState state)
+        => state.IndexFirstActionMatching(act => act is T);
+
+    /// <summary>
+    ///     Finds the index of the last action in a state that is of type <typeparamref name="T" />.
+    /// </summary>
+    /// <param name="state">The state</param>
+    /// <typeparam name="T">The type of action to look for</typeparam>
+    /// <returns>The index of the found action, or -1 if it was not found.</returns>
+    [PublicAPI]
+    public static int IndexLastActionOfType<T>(this FsmState state)
+        => state.IndexLastActionMatching(act => act is T);
+
+    #endregion Index
+
     #region Add
 
     private static TVal[] AddItemToArray<TVal>(TVal[] origArray, TVal value)
@@ -348,11 +425,11 @@ public static FsmState CopyState(this Fsm fsm, string fromState, string toState)
     /// <param name="toState">The name of the new state</param>
     /// <returns>The event of the transition</returns>
     [PublicAPI]
-    public static FsmEvent AddTransition(this PlayMakerFSM fsm, string stateName, string eventName, string toState) => fsm.GetState(stateName)!.AddTransition(eventName, toState);
+    public static FsmEvent AddTransition(this PlayMakerFSM fsm, string stateName, string eventName, string toState) => fsm.MustGetState(stateName).AddTransition(eventName, toState);
 
     /// <inheritdoc cref="AddTransition(PlayMakerFSM, string, string, string)"/>
     [PublicAPI]
-    public static FsmEvent AddTransition(this Fsm fsm, string stateName, string eventName, string toState) => fsm.GetState(stateName)!.AddTransition(eventName, toState);
+    public static FsmEvent AddTransition(this Fsm fsm, string stateName, string eventName, string toState) => fsm.MustGetState(stateName).AddTransition(eventName, toState);
 
     /// <inheritdoc cref="AddTransition(PlayMakerFSM, string, string, string)"/>
     /// <param name="state">The state from which the transition starts</param>
@@ -404,11 +481,11 @@ public static FsmEvent AddGlobalTransition(this Fsm fsm, string globalEventName,
     /// <param name="stateName">The name of the state in which the action is added</param>
     /// <param name="action">The action</param>
     [PublicAPI]
-    public static void AddAction(this PlayMakerFSM fsm, string stateName, FsmStateAction action) => fsm.GetState(stateName)!.AddAction(action);
+    public static void AddAction(this PlayMakerFSM fsm, string stateName, FsmStateAction action) => fsm.MustGetState(stateName).AddAction(action);
 
     /// <inheritdoc cref="AddAction(PlayMakerFSM, string, FsmStateAction)"/>
     [PublicAPI]
-    public static void AddAction(this Fsm fsm, string stateName, FsmStateAction action) => fsm.GetState(stateName)!.AddAction(action);
+    public static void AddAction(this Fsm fsm, string stateName, FsmStateAction action) => fsm.MustGetState(stateName).AddAction(action);
 
     /// <inheritdoc cref="AddAction(PlayMakerFSM, string, FsmStateAction)"/>
     /// <param name="state">The fsm state</param>
@@ -428,11 +505,11 @@ public static void AddAction(this FsmState state, FsmStateAction action)
     /// <param name="stateName">The name of the state in which the action is added</param>
     /// <param name="actions">The actions</param>
     [PublicAPI]
-    public static void AddActions(this PlayMakerFSM fsm, string stateName, params FsmStateAction[] actions) => fsm.GetState(stateName)!.AddActions(actions);
+    public static void AddActions(this PlayMakerFSM fsm, string stateName, params FsmStateAction[] actions) => fsm.MustGetState(stateName).AddActions(actions);
 
     /// <inheritdoc cref="AddActions(PlayMakerFSM, string, FsmStateAction[])"/>
     [PublicAPI]
-    public static void AddActions(this Fsm fsm, string stateName, params FsmStateAction[] actions) => fsm.GetState(stateName)!.AddActions(actions);
+    public static void AddActions(this Fsm fsm, string stateName, params FsmStateAction[] actions) => fsm.MustGetState(stateName).AddActions(actions);
 
     /// <inheritdoc cref="AddActions(PlayMakerFSM, string, FsmStateAction[])"/>
     /// <param name="state">The fsm state</param>
@@ -453,11 +530,11 @@ public static void AddActions(this FsmState state, params FsmStateAction[] actio
     /// <param name="stateName">The name of the state in which the method is added</param>
     /// <param name="method">The method that will be invoked with the action as the parameter</param>
     [PublicAPI]
-    public static void AddMethod(this PlayMakerFSM fsm, string stateName, Action<FsmStateAction> method) => fsm.GetState(stateName)!.AddMethod(method);
+    public static void AddMethod(this PlayMakerFSM fsm, string stateName, Action<FsmStateAction> method) => fsm.MustGetState(stateName).AddMethod(method);
 
     /// <inheritdoc cref="AddMethod(PlayMakerFSM, string, Action{FsmStateAction})"/>
     [PublicAPI]
-    public static void AddMethod(this Fsm fsm, string stateName, Action<FsmStateAction> method) => fsm.GetState(stateName)!.AddMethod(method);
+    public static void AddMethod(this Fsm fsm, string stateName, Action<FsmStateAction> method) => fsm.MustGetState(stateName).AddMethod(method);
 
     /// <inheritdoc cref="AddMethod(PlayMakerFSM, string, Action{FsmStateAction})"/>
     /// <param name="state">The fsm state</param>
@@ -478,11 +555,11 @@ public static void AddMethod(this FsmState state, Action<FsmStateAction> method)
     /// <param name="method">The method that will be invoked</param>
     /// <param name="everyFrame">If true, execute the function repeatedly on every update frame</param>
     [PublicAPI]
-    public static void AddMethod(this PlayMakerFSM fsm, string stateName, Action method, bool everyFrame = false) => fsm.GetState(stateName)!.AddMethod(method, everyFrame);
+    public static void AddMethod(this PlayMakerFSM fsm, string stateName, Action method, bool everyFrame = false) => fsm.MustGetState(stateName).AddMethod(method, everyFrame);
 
     /// <inheritdoc cref="AddMethod(PlayMakerFSM, string, Action, bool)"/>
     [PublicAPI]
-    public static void AddMethod(this Fsm fsm, string stateName, Action method, bool everyFrame = false) => fsm.GetState(stateName)!.AddMethod(method, everyFrame);
+    public static void AddMethod(this Fsm fsm, string stateName, Action method, bool everyFrame = false) => fsm.MustGetState(stateName).AddMethod(method, everyFrame);
 
     /// <inheritdoc cref="AddMethod(PlayMakerFSM, string, Action, bool)"/>
     /// <param name="state">The fsm state</param>
@@ -491,10 +568,10 @@ public static void AddMethod(this FsmState state, Action<FsmStateAction> method)
     [PublicAPI]
     public static void AddMethod(this FsmState state, Action method, bool everyFrame = false)
     {
-        LambdaAction action = new()
+        LambdaAction action = new()
         {
             Method = method,
-            EveryFrame = everyFrame,
+            EveryFrame = everyFrame,
         };
         state.AddAction(action);
     }
@@ -506,11 +583,11 @@ public static void AddMethod(this FsmState state, Action method, bool everyFrame
     /// <param name="stateName">The name of the state in which the method is added</param>
     /// <param name="method">The method that will be invoked with the finish action as the parameter</param>
     [PublicAPI]
-    public static void AddLambdaMethod(this PlayMakerFSM fsm, string stateName, Action<Action> method) => fsm.GetState(stateName)!.AddLambdaMethod(method);
+    public static void AddLambdaMethod(this PlayMakerFSM fsm, string stateName, Action<Action> method) => fsm.MustGetState(stateName).AddLambdaMethod(method);
 
     /// <inheritdoc cref="AddLambdaMethod(PlayMakerFSM, string, Action{Action})"/>
     [PublicAPI]
-    public static void AddLambdaMethod(this Fsm fsm, string stateName, Action<Action> method) => fsm.GetState(stateName)!.AddLambdaMethod(method);
+    public static void AddLambdaMethod(this Fsm fsm, string stateName, Action<Action> method) => fsm.MustGetState(stateName).AddLambdaMethod(method);
 
     /// <inheritdoc cref="AddLambdaMethod(PlayMakerFSM, string, Action{Action})"/>
     /// <param name="state">The fsm state</param>
@@ -558,19 +635,19 @@ private static TVal[] InsertItemIntoArray<TVal>(TVal[] origArray, TVal value, in
     /// <param name="index">The index to place the action in</param>
     /// <returns>bool that indicates whether the insertion was successful</returns>
     [PublicAPI]
-    public static void InsertAction(this PlayMakerFSM fsm, string stateName, FsmStateAction action, int index) => fsm.GetState(stateName)!.InsertAction(index, action);
+    public static void InsertAction(this PlayMakerFSM fsm, string stateName, FsmStateAction action, int index) => fsm.MustGetState(stateName).InsertAction(index, action);
 
     /// <inheritdoc cref="InsertAction(PlayMakerFSM, string, FsmStateAction, int)"/>
     [PublicAPI]
-    public static void InsertAction(this PlayMakerFSM fsm, string stateName, int index, FsmStateAction action) => fsm.GetState(stateName)!.InsertAction(index, action);
+    public static void InsertAction(this PlayMakerFSM fsm, string stateName, int index, FsmStateAction action) => fsm.MustGetState(stateName).InsertAction(index, action);
 
     /// <inheritdoc cref="InsertAction(PlayMakerFSM, string, FsmStateAction, int)"/>
     [PublicAPI]
-    public static void InsertAction(this Fsm fsm, string stateName, FsmStateAction action, int index) => fsm.GetState(stateName)!.InsertAction(index, action);
+    public static void InsertAction(this Fsm fsm, string stateName, FsmStateAction action, int index) => fsm.MustGetState(stateName).InsertAction(index, action);
 
     /// <inheritdoc cref="InsertAction(PlayMakerFSM, string, FsmStateAction, int)"/>
     [PublicAPI]
-    public static void InsertAction(this Fsm fsm, string stateName, int index, FsmStateAction action) => fsm.GetState(stateName)!.InsertAction(index, action);
+    public static void InsertAction(this Fsm fsm, string stateName, int index, FsmStateAction action) => fsm.MustGetState(stateName).InsertAction(index, action);
 
     /// <inheritdoc cref="InsertAction(PlayMakerFSM, string, FsmStateAction, int)"/>
     /// <param name="state">The fsm state</param>
@@ -598,11 +675,11 @@ public static void InsertAction(this FsmState state, int index, FsmStateAction a
     /// <param name="index">The index to place the actions in</param>
     /// <returns>bool that indicates whether the insertion was successful</returns>
     [PublicAPI]
-    public static void InsertActions(this PlayMakerFSM fsm, string stateName, int index, params FsmStateAction[] actions) => fsm.GetState(stateName)!.InsertActions(index, actions);
+    public static void InsertActions(this PlayMakerFSM fsm, string stateName, int index, params FsmStateAction[] actions) => fsm.MustGetState(stateName).InsertActions(index, actions);
 
     /// <inheritdoc cref="InsertActions(PlayMakerFSM, string, int, FsmStateAction[])"/>
     [PublicAPI]
-    public static void InsertActions(this Fsm fsm, string stateName, int index, params FsmStateAction[] actions) => fsm.GetState(stateName)!.InsertActions(index, actions);
+    public static void InsertActions(this Fsm fsm, string stateName, int index, params FsmStateAction[] actions) => fsm.MustGetState(stateName).InsertActions(index, actions);
 
     /// <inheritdoc cref="InsertActions(PlayMakerFSM, string, int, FsmStateAction[])"/>
     /// <param name="state">The fsm state</param>
@@ -628,19 +705,19 @@ public static void InsertActions(this FsmState state, int index, params FsmState
     /// <param name="index">The index to place the action in</param>
     /// <returns>bool that indicates whether the insertion was successful</returns>
     [PublicAPI]
-    public static void InsertMethod(this PlayMakerFSM fsm, string stateName, Action<FsmStateAction> method, int index) => fsm.GetState(stateName)!.InsertMethod(index, method);
+    public static void InsertMethod(this PlayMakerFSM fsm, string stateName, Action<FsmStateAction> method, int index) => fsm.MustGetState(stateName).InsertMethod(index, method);
 
     /// <inheritdoc cref="InsertMethod(PlayMakerFSM, string, Action{FsmStateAction}, int)"/>
     [PublicAPI]
-    public static void InsertMethod(this PlayMakerFSM fsm, string stateName, int index, Action<FsmStateAction> method) => fsm.GetState(stateName)!.InsertMethod(index, method);
+    public static void InsertMethod(this PlayMakerFSM fsm, string stateName, int index, Action<FsmStateAction> method) => fsm.MustGetState(stateName).InsertMethod(index, method);
 
     /// <inheritdoc cref="InsertMethod(PlayMakerFSM, string, Action{FsmStateAction}, int)"/>
     [PublicAPI]
-    public static void InsertMethod(this Fsm fsm, string stateName, Action<FsmStateAction> method, int index) => fsm.GetState(stateName)!.InsertMethod(index, method);
+    public static void InsertMethod(this Fsm fsm, string stateName, Action<FsmStateAction> method, int index) => fsm.MustGetState(stateName).InsertMethod(index, method);
 
     /// <inheritdoc cref="InsertMethod(PlayMakerFSM, string, Action{FsmStateAction}, int)"/>
     [PublicAPI]
-    public static void InsertMethod(this Fsm fsm, string stateName, int index, Action<FsmStateAction> method) => fsm.GetState(stateName)!.InsertMethod(index, method);
+    public static void InsertMethod(this Fsm fsm, string stateName, int index, Action<FsmStateAction> method) => fsm.MustGetState(stateName).InsertMethod(index, method);
 
     /// <inheritdoc cref="InsertMethod(PlayMakerFSM, string, Action{FsmStateAction}, int)"/>
     /// <param name="state">The fsm state</param>
@@ -669,19 +746,19 @@ public static void InsertMethod(this FsmState state, int index, Action<FsmStateA
     /// <param name="everyFrame">Whether to execute 'method' on every update frame</param>
     /// <returns>bool that indicates whether the insertion was successful</returns>
     [PublicAPI]
-    public static void InsertMethod(this PlayMakerFSM fsm, string stateName, Action method, int index, bool everyFrame = false) => fsm.GetState(stateName)!.InsertMethod(index, method, everyFrame);
+    public static void InsertMethod(this PlayMakerFSM fsm, string stateName, Action method, int index, bool everyFrame = false) => fsm.MustGetState(stateName).InsertMethod(index, method, everyFrame);
 
     /// <inheritdoc cref="InsertMethod(PlayMakerFSM, string, Action, int, bool)"/>
     [PublicAPI]
-    public static void InsertMethod(this PlayMakerFSM fsm, string stateName, int index, Action method, bool everyFrame = false) => fsm.GetState(stateName)!.InsertMethod(index, method, everyFrame);
+    public static void InsertMethod(this PlayMakerFSM fsm, string stateName, int index, Action method, bool everyFrame = false) => fsm.MustGetState(stateName).InsertMethod(index, method, everyFrame);
 
     /// <inheritdoc cref="InsertMethod(PlayMakerFSM, string, Action, int, bool)"/>
     [PublicAPI]
-    public static void InsertMethod(this Fsm fsm, string stateName, Action method, int index, bool everyFrame = false) => fsm.GetState(stateName)!.InsertMethod(index, method, everyFrame);
+    public static void InsertMethod(this Fsm fsm, string stateName, Action method, int index, bool everyFrame = false) => fsm.MustGetState(stateName).InsertMethod(index, method, everyFrame);
 
     /// <inheritdoc cref="InsertMethod(PlayMakerFSM, string, Action, int, bool)"/>
     [PublicAPI]
-    public static void InsertMethod(this Fsm fsm, string stateName, int index, Action method, bool everyFrame = false) => fsm.GetState(stateName)!.InsertMethod(index, method, everyFrame);
+    public static void InsertMethod(this Fsm fsm, string stateName, int index, Action method, bool everyFrame = false) => fsm.MustGetState(stateName).InsertMethod(index, method, everyFrame);
 
     /// <inheritdoc cref="InsertMethod(PlayMakerFSM, string, Action, int, bool)"/>
     /// <param name="state">The fsm state</param>
@@ -713,19 +790,19 @@ public static void InsertMethod(this FsmState state, int index, Action method, b
     /// <param name="index">The index to place the action in</param>
     /// <returns>bool that indicates whether the insertion was successful</returns>
     [PublicAPI]
-    public static void InsertLambdaMethod(this PlayMakerFSM fsm, string stateName, Action<Action> method, int index) => fsm.GetState(stateName)!.InsertLambdaMethod(index, method);
+    public static void InsertLambdaMethod(this PlayMakerFSM fsm, string stateName, Action<Action> method, int index) => fsm.MustGetState(stateName).InsertLambdaMethod(index, method);
 
     /// <inheritdoc cref="InsertLambdaMethod(PlayMakerFSM, string, Action{Action}, int)"/>
     [PublicAPI]
-    public static void InsertLambdaMethod(this PlayMakerFSM fsm, string stateName, int index, Action<Action> method) => fsm.GetState(stateName)!.InsertLambdaMethod(index, method);
+    public static void InsertLambdaMethod(this PlayMakerFSM fsm, string stateName, int index, Action<Action> method) => fsm.MustGetState(stateName).InsertLambdaMethod(index, method);
 
     /// <inheritdoc cref="InsertLambdaMethod(PlayMakerFSM, string, Action{Action}, int)"/>
     [PublicAPI]
-    public static void InsertLambdaMethod(this Fsm fsm, string stateName, Action<Action> method, int index) => fsm.GetState(stateName)!.InsertLambdaMethod(index, method);
+    public static void InsertLambdaMethod(this Fsm fsm, string stateName, Action<Action> method, int index) => fsm.MustGetState(stateName).InsertLambdaMethod(index, method);
 
     /// <inheritdoc cref="InsertLambdaMethod(PlayMakerFSM, string, Action{Action}, int)"/>
     [PublicAPI]
-    public static void InsertLambdaMethod(this Fsm fsm, string stateName, int index, Action<Action> method) => fsm.GetState(stateName)!.InsertLambdaMethod(index, method);
+    public static void InsertLambdaMethod(this Fsm fsm, string stateName, int index, Action<Action> method) => fsm.MustGetState(stateName).InsertLambdaMethod(index, method);
 
     /// <inheritdoc cref="InsertLambdaMethod(PlayMakerFSM, string, Action{Action}, int)"/>
     /// <param name="state">The fsm state</param>
@@ -859,19 +936,19 @@ public static void InsertActionAfter(this FsmStateAction action, FsmStateAction
     /// <param name="action">The action</param>
     /// <param name="index">The index of the action</param>
     [PublicAPI]
-    public static void ReplaceAction(this PlayMakerFSM fsm, string stateName, FsmStateAction action, int index) => fsm.GetState(stateName)!.ReplaceAction(index, action);
+    public static void ReplaceAction(this PlayMakerFSM fsm, string stateName, FsmStateAction action, int index) => fsm.MustGetState(stateName).ReplaceAction(index, action);
 
     /// <inheritdoc cref="ReplaceAction(PlayMakerFSM, string, FsmStateAction, int)"/>
     [PublicAPI]
-    public static void ReplaceAction(this PlayMakerFSM fsm, string stateName, int index, FsmStateAction action) => fsm.GetState(stateName)!.ReplaceAction(index, action);
+    public static void ReplaceAction(this PlayMakerFSM fsm, string stateName, int index, FsmStateAction action) => fsm.MustGetState(stateName).ReplaceAction(index, action);
 
     /// <inheritdoc cref="ReplaceAction(PlayMakerFSM, string, FsmStateAction, int)"/>
     [PublicAPI]
-    public static void ReplaceAction(this Fsm fsm, string stateName, FsmStateAction action, int index) => fsm.GetState(stateName)!.ReplaceAction(index, action);
+    public static void ReplaceAction(this Fsm fsm, string stateName, FsmStateAction action, int index) => fsm.MustGetState(stateName).ReplaceAction(index, action);
 
     /// <inheritdoc cref="ReplaceAction(PlayMakerFSM, string, FsmStateAction, int)"/>
     [PublicAPI]
-    public static void ReplaceAction(this Fsm fsm, string stateName, int index, FsmStateAction action) => fsm.GetState(stateName)!.ReplaceAction(index, action);
+    public static void ReplaceAction(this Fsm fsm, string stateName, int index, FsmStateAction action) => fsm.MustGetState(stateName).ReplaceAction(index, action);
 
     /// <inheritdoc cref="ReplaceAction(PlayMakerFSM, string, FsmStateAction, int)"/>
     /// <param name="state">The state in which the action is replaced</param>
@@ -895,11 +972,11 @@ public static void ReplaceAction(this FsmState state, int index, FsmStateAction
     /// <param name="stateName">The name of the state in which the actions are to be replaced</param>
     /// <param name="actions">The new actions of the state</param>
     [PublicAPI]
-    public static void ReplaceAllActions(this PlayMakerFSM fsm, string stateName, params FsmStateAction[] actions) => fsm.GetState(stateName)!.ReplaceAllActions(actions);
+    public static void ReplaceAllActions(this PlayMakerFSM fsm, string stateName, params FsmStateAction[] actions) => fsm.MustGetState(stateName).ReplaceAllActions(actions);
 
     /// <inheritdoc cref="ReplaceAllActions(PlayMakerFSM, string, FsmStateAction[])"/>
     [PublicAPI]
-    public static void ReplaceAllActions(this Fsm fsm, string stateName, params FsmStateAction[] actions) => fsm.GetState(stateName)!.ReplaceAllActions(actions);
+    public static void ReplaceAllActions(this Fsm fsm, string stateName, params FsmStateAction[] actions) => fsm.MustGetState(stateName).ReplaceAllActions(actions);
 
     /// <inheritdoc cref="ReplaceAllActions(PlayMakerFSM, string, FsmStateAction[])"/>
     /// <param name="state">The fsm state</param>
@@ -912,81 +989,81 @@ public static void ReplaceAllActions(this FsmState state, params FsmStateAction[
         {
             action.Init(state);
         }
-    }
-
-    /// <summary>
-    /// Replace all actions of type <typeparamref name="T"/> with new actions.
-    /// </summary>
-    /// <typeparam name="T">The type of actions to replace.</typeparam>
-    /// <param name="state">The state containing actions to replace.</param>
-    /// <param name="newActionGenerator">Function used to generate the new actions.</param>
-    [PublicAPI]
-    public static void ReplaceActionsOfType<T>(this FsmState state, Func<T, FsmStateAction> newActionGenerator)
-        where T : FsmStateAction
-    {
-        for (int i = 0; i < state.actions.Length; i++)
-        {
-            if (state.Actions[i] is T typedAction)
-            {
-                state.ReplaceAction(i, newActionGenerator(typedAction));
-            }
-        }
-    }
-
-    /// <summary>
-    /// Replace the first action of type <typeparamref name="T"/> with a new action.
-    /// </summary>
-    /// <typeparam name="T">The type of the action to replace.</typeparam>
-    /// <param name="state">The state holding the actions.</param>
-    /// <param name="newAction">The new action.</param>
-    [PublicAPI]
-    public static void ReplaceFirstActionOfType<T>(this FsmState state, FsmStateAction newAction) where T : FsmStateAction
-    {
-        int foundIndex = -2;
-
-        for (int i = 0; i < state.actions.Length; i++)
-        {
-            if (state.actions[i] is T)
-            {
-                foundIndex = i;
-                break;
-            }
-        }
-
-        if (foundIndex == -2)
-        {
-            return;
-        }
-
-        state.ReplaceAction(newAction, foundIndex);
-    }
-
-    /// <summary>
-    /// Replace the last action of type <typeparamref name="T"/> with a new action.
-    /// </summary>
-    /// <typeparam name="T">The type of the action to replace.</typeparam>
-    /// <param name="state">The state holding the actions.</param>
-    /// <param name="newAction">The new action.</param>
-    [PublicAPI]
-    public static void ReplaceLastActionOfType<T>(this FsmState state, FsmStateAction newAction) where T : FsmStateAction
-    {
-        int foundIndex = -2;
-
-        for (int i = state.actions.Length - 1; i >= 0; i--)
-        {
-            if (state.actions[i] is T)
-            {
-                foundIndex = i;
-                break;
-            }
-        }
-
-        if (foundIndex == -2)
-        {
-            return;
-        }
-
-        state.ReplaceAction(newAction, foundIndex);
+    }
+
+    /// <summary>
+    /// Replace all actions of type <typeparamref name="T"/> with new actions.
+    /// </summary>
+    /// <typeparam name="T">The type of actions to replace.</typeparam>
+    /// <param name="state">The state containing actions to replace.</param>
+    /// <param name="newActionGenerator">Function used to generate the new actions.</param>
+    [PublicAPI]
+    public static void ReplaceActionsOfType<T>(this FsmState state, Func<T, FsmStateAction> newActionGenerator)
+        where T : FsmStateAction
+    {
+        for (int i = 0; i < state.actions.Length; i++)
+        {
+            if (state.Actions[i] is T typedAction)
+            {
+                state.ReplaceAction(i, newActionGenerator(typedAction));
+            }
+        }
+    }
+
+    /// <summary>
+    /// Replace the first action of type <typeparamref name="T"/> with a new action.
+    /// </summary>
+    /// <typeparam name="T">The type of the action to replace.</typeparam>
+    /// <param name="state">The state holding the actions.</param>
+    /// <param name="newAction">The new action.</param>
+    [PublicAPI]
+    public static void ReplaceFirstActionOfType<T>(this FsmState state, FsmStateAction newAction) where T : FsmStateAction
+    {
+        int foundIndex = -2;
+
+        for (int i = 0; i < state.actions.Length; i++)
+        {
+            if (state.actions[i] is T)
+            {
+                foundIndex = i;
+                break;
+            }
+        }
+
+        if (foundIndex == -2)
+        {
+            return;
+        }
+
+        state.ReplaceAction(newAction, foundIndex);
+    }
+
+    /// <summary>
+    /// Replace the last action of type <typeparamref name="T"/> with a new action.
+    /// </summary>
+    /// <typeparam name="T">The type of the action to replace.</typeparam>
+    /// <param name="state">The state holding the actions.</param>
+    /// <param name="newAction">The new action.</param>
+    [PublicAPI]
+    public static void ReplaceLastActionOfType<T>(this FsmState state, FsmStateAction newAction) where T : FsmStateAction
+    {
+        int foundIndex = -2;
+
+        for (int i = state.actions.Length - 1; i >= 0; i--)
+        {
+            if (state.actions[i] is T)
+            {
+                foundIndex = i;
+                break;
+            }
+        }
+
+        if (foundIndex == -2)
+        {
+            return;
+        }
+
+        state.ReplaceAction(newAction, foundIndex);
     }
 
     #endregion Replace
@@ -1002,11 +1079,11 @@ public static void ReplaceLastActionOfType<T>(this FsmState state, FsmStateActio
     /// <param name="toState">The new endpoint of the transition</param>
     /// <returns>bool that indicates whether the change was successful</returns>
     [PublicAPI]
-    public static bool ChangeTransition(this PlayMakerFSM fsm, string stateName, string eventName, string toState) => fsm.GetState(stateName)!.ChangeTransition(eventName, toState);
+    public static bool ChangeTransition(this PlayMakerFSM fsm, string stateName, string eventName, string toState) => fsm.MustGetState(stateName).ChangeTransition(eventName, toState);
 
     /// <inheritdoc cref="ChangeTransition(PlayMakerFSM, string, string, string)"/>
     [PublicAPI]
-    public static bool ChangeTransition(this Fsm fsm, string stateName, string eventName, string toState) => fsm.GetState(stateName)!.ChangeTransition(eventName, toState);
+    public static bool ChangeTransition(this Fsm fsm, string stateName, string eventName, string toState) => fsm.MustGetState(stateName).ChangeTransition(eventName, toState);
 
     /// <inheritdoc cref="ChangeTransition(PlayMakerFSM, string, string, string)"/>
     /// <param name="state">The fsm state</param>
@@ -1102,11 +1179,11 @@ private static TVal[] RemoveItemsFromArray<TVal>(TVal[] origArray, Func<TVal, bo
     /// <param name="stateName">The name of the state from which the transition starts</param>
     /// <param name="eventName">The event of the transition</param>
     [PublicAPI]
-    public static void RemoveTransition(this PlayMakerFSM fsm, string stateName, string eventName) => fsm.GetState(stateName)!.RemoveTransition(eventName);
+    public static void RemoveTransition(this PlayMakerFSM fsm, string stateName, string eventName) => fsm.MustGetState(stateName).RemoveTransition(eventName);
 
     /// <inheritdoc cref="RemoveTransition(PlayMakerFSM, string, string)"/>
     [PublicAPI]
-    public static void RemoveTransition(this Fsm fsm, string stateName, string eventName) => fsm.GetState(stateName)!.RemoveTransition(eventName);
+    public static void RemoveTransition(this Fsm fsm, string stateName, string eventName) => fsm.MustGetState(stateName).RemoveTransition(eventName);
 
     /// <inheritdoc cref="RemoveTransition(PlayMakerFSM, string, string)"/>
     /// <param name="state">The fsm state</param>
@@ -1156,11 +1233,11 @@ public static void RemoveTransitionsTo(this Fsm fsm, string toState)
     /// <param name="stateName">The name of the state from which the transition starts</param>
     /// <param name="toState">The target of the transition</param>
     [PublicAPI]
-    public static void RemoveTransitionsTo(this PlayMakerFSM fsm, string stateName, string toState) => fsm.GetState(stateName)!.RemoveTransitionsTo(toState);
+    public static void RemoveTransitionsTo(this PlayMakerFSM fsm, string stateName, string toState) => fsm.MustGetState(stateName).RemoveTransitionsTo(toState);
 
     /// <inheritdoc cref="RemoveTransitionsTo(PlayMakerFSM, string, string)"/>
     [PublicAPI]
-    public static void RemoveTransitionsTo(this Fsm fsm, string stateName, string toState) => fsm.GetState(stateName)!.RemoveTransitionsTo(toState);
+    public static void RemoveTransitionsTo(this Fsm fsm, string stateName, string toState) => fsm.MustGetState(stateName).RemoveTransitionsTo(toState);
 
     /// <inheritdoc cref="RemoveTransitionsTo(PlayMakerFSM, string, string)"/>
     /// <param name="state">The fsm state</param>
@@ -1174,11 +1251,11 @@ public static void RemoveTransitionsTo(this Fsm fsm, string toState)
     /// <param name="fsm">The fsm</param>
     /// <param name="stateName">The name of the state from which the transition starts</param>
     [PublicAPI]
-    public static void RemoveTransitions(this PlayMakerFSM fsm, string stateName) => fsm.GetState(stateName)!.RemoveTransitions();
+    public static void RemoveTransitions(this PlayMakerFSM fsm, string stateName) => fsm.MustGetState(stateName).RemoveTransitions();
 
     /// <inheritdoc cref="RemoveTransitions(PlayMakerFSM, string)"/>
     [PublicAPI]
-    public static void RemoveTransitions(this Fsm fsm, string stateName) => fsm.GetState(stateName)!.RemoveTransitions();
+    public static void RemoveTransitions(this Fsm fsm, string stateName) => fsm.MustGetState(stateName).RemoveTransitions();
 
     /// <inheritdoc cref="RemoveTransitions(PlayMakerFSM, string)"/>
     /// <param name="state">The fsm state</param>
@@ -1193,11 +1270,11 @@ public static void RemoveTransitionsTo(this Fsm fsm, string toState)
     /// <param name="stateName">The name of the state with the action</param>
     /// <param name="index">The index of the action</param>
     [PublicAPI]
-    public static bool RemoveAction(this PlayMakerFSM fsm, string stateName, int index) => fsm.GetState(stateName)!.RemoveAction(index);
+    public static bool RemoveAction(this PlayMakerFSM fsm, string stateName, int index) => fsm.MustGetState(stateName).RemoveAction(index);
 
     /// <inheritdoc cref="RemoveAction(PlayMakerFSM, string, int)"/>
     [PublicAPI]
-    public static bool RemoveAction(this Fsm fsm, string stateName, int index) => fsm.GetState(stateName)!.RemoveAction(index);
+    public static bool RemoveAction(this Fsm fsm, string stateName, int index) => fsm.MustGetState(stateName).RemoveAction(index);
 
     /// <inheritdoc cref="RemoveAction(PlayMakerFSM, string, int)"/>
     /// <param name="state">The fsm state</param>
@@ -1251,11 +1328,11 @@ public static void RemoveActionsOfType<TAction>(this Fsm fsm)
     /// <param name="fsm">The fsm</param>
     /// <param name="stateName">The name of the state to remove the actions from</param>
     [PublicAPI]
-    public static void RemoveActionsOfType<TAction>(this PlayMakerFSM fsm, string stateName) => fsm.GetState(stateName)!.RemoveActionsOfType<TAction>();
+    public static void RemoveActionsOfType<TAction>(this PlayMakerFSM fsm, string stateName) => fsm.MustGetState(stateName).RemoveActionsOfType<TAction>();
 
     /// <inheritdoc cref="RemoveActionsOfType{TAction}(PlayMakerFSM, string)"/>
     [PublicAPI]
-    public static void RemoveActionsOfType<TAction>(this Fsm fsm, string stateName) => fsm.GetState(stateName)!.RemoveActionsOfType<TAction>();
+    public static void RemoveActionsOfType<TAction>(this Fsm fsm, string stateName) => fsm.MustGetState(stateName).RemoveActionsOfType<TAction>();
 
     /// <inheritdoc cref="RemoveActionsOfType{TAction}(PlayMakerFSM, string)"/>
     /// <param name="state">The fsm state</param>
@@ -1269,32 +1346,39 @@ public static void RemoveActionsOfType<TAction>(this Fsm fsm)
     /// <param name="fsm">The fsm</param>
     /// <param name="stateName">The name of the state to remove the actions from</param>
     [PublicAPI]
-    public static void RemoveFirstActionOfType<TAction>(this PlayMakerFSM fsm, string stateName) => fsm.GetState(stateName)!.RemoveFirstActionOfType<TAction>();
+    public static void RemoveFirstActionOfType<TAction>(this PlayMakerFSM fsm, string stateName) => fsm.MustGetState(stateName).RemoveFirstActionOfType<TAction>();
 
     /// <inheritdoc cref="RemoveFirstActionOfType{TAction}(PlayMakerFSM, string)"/>
     [PublicAPI]
-    public static void RemoveFirstActionOfType<TAction>(this Fsm fsm, string stateName) => fsm.GetState(stateName)!.RemoveFirstActionOfType<TAction>();
+    public static void RemoveFirstActionOfType<TAction>(this Fsm fsm, string stateName) => fsm.MustGetState(stateName).RemoveFirstActionOfType<TAction>();
 
     /// <inheritdoc cref="RemoveFirstActionOfType{TAction}(PlayMakerFSM, string)"/>
     /// <param name="state">The fsm state</param>
     [PublicAPI]
     public static void RemoveFirstActionOfType<TAction>(this FsmState state)
     {
-        int firstActionIndex = -1;
-        for (int i = 0; i < state.Actions.Length; i++)
-        {
-            if (state.Actions[i] is TAction)
-            {
-                firstActionIndex = i;
-                break;
-            }
-        }
+        int firstActionIndex = state.IndexFirstActionOfType<TAction>();
 
         if (firstActionIndex == -1)
             return;
         state.RemoveAction(firstActionIndex);
     }
 
+    /// <summary>
+    ///     Removes the first action in a state that matches the predicate.
+    /// </summary>
+    /// <param name="state">The state</param>
+    /// <param name="predicate">The predicate that each action is matched against</param>
+    [PublicAPI]
+    public static void RemoveFirstActionMatching(this FsmState state, Func<FsmStateAction, bool> predicate)
+    {
+        int i = state.IndexFirstActionMatching(predicate);
+        if (i != -1)
+        {
+            state.RemoveAction(i);
+        }
+    }
+
     /// <summary>
     ///     Removes last action of a given type in an FsmState.  
     /// </summary>
@@ -1302,32 +1386,39 @@ public static void RemoveFirstActionOfType<TAction>(this FsmState state)
     /// <param name="fsm">The fsm</param>
     /// <param name="stateName">The name of the state to remove the actions from</param>
     [PublicAPI]
-    public static void RemoveLastActionOfType<TAction>(this PlayMakerFSM fsm, string stateName) => fsm.GetState(stateName)!.RemoveLastActionOfType<TAction>();
+    public static void RemoveLastActionOfType<TAction>(this PlayMakerFSM fsm, string stateName) => fsm.MustGetState(stateName).RemoveLastActionOfType<TAction>();
 
     /// <inheritdoc cref="RemoveLastActionOfType{TAction}(PlayMakerFSM, string)"/>
     [PublicAPI]
-    public static void RemoveLastActionOfType<TAction>(this Fsm fsm, string stateName) => fsm.GetState(stateName)!.RemoveLastActionOfType<TAction>();
+    public static void RemoveLastActionOfType<TAction>(this Fsm fsm, string stateName) => fsm.MustGetState(stateName).RemoveLastActionOfType<TAction>();
 
     /// <inheritdoc cref="RemoveLastActionOfType{TAction}(PlayMakerFSM, string)"/>
     /// <param name="state">The fsm state</param>
     [PublicAPI]
     public static void RemoveLastActionOfType<TAction>(this FsmState state)
     {
-        int lastActionIndex = -1;
-        for (int i = state.Actions.Length - 1; i >= 0; i--)
-        {
-            if (state.Actions[i] is TAction)
-            {
-                lastActionIndex = i;
-                break;
-            }
-        }
+        int lastActionIndex = state.IndexLastActionOfType<TAction>();
 
         if (lastActionIndex == -1)
             return;
         state.RemoveAction(lastActionIndex);
     }
 
+    /// <summary>
+    ///     Removes the last action in a state that matches the predicate.
+    /// </summary>
+    /// <param name="state">The state</param>
+    /// <param name="predicate">The predicate that each action is matched against</param>
+    [PublicAPI]
+    public static void RemoveLastActionMatching(this FsmState state, Func<FsmStateAction, bool> predicate)
+    {
+        int i = state.IndexLastActionMatching(predicate);
+        if (i != -1)
+        {
+            state.RemoveAction(i);
+        }
+    }
+
     #endregion Remove
 
     #region Disable
@@ -1341,11 +1432,11 @@ public static void RemoveLastActionOfType<TAction>(this FsmState state)
     /// <param name="index">The index of the action</param>
     /// <returns>bool that indicates whether the disabling was successful</returns>
     [PublicAPI]
-    public static bool DisableAction(this PlayMakerFSM fsm, string stateName, int index) => fsm.GetState(stateName)!.DisableAction(index);
+    public static bool DisableAction(this PlayMakerFSM fsm, string stateName, int index) => fsm.MustGetState(stateName).DisableAction(index);
 
     /// <inheritdoc cref="DisableAction(PlayMakerFSM, string, int)"/>
     [PublicAPI]
-    public static bool DisableAction(this Fsm fsm, string stateName, int index) => fsm.GetState(stateName)!.DisableAction(index);
+    public static bool DisableAction(this Fsm fsm, string stateName, int index) => fsm.MustGetState(stateName).DisableAction(index);
 
     /// <inheritdoc cref="DisableAction(PlayMakerFSM, string, int)"/>
     /// <param name="state">The fsm state</param>
@@ -1370,11 +1461,11 @@ public static bool DisableAction(this FsmState state, int index)
     /// <param name="indices">The indices of the action</param>
     /// <returns>bool that indicates whether all the disablings were successful</returns>
     [PublicAPI]
-    public static bool DisableActions(this PlayMakerFSM fsm, string stateName, params int[] indices) => fsm.GetState(stateName)!.DisableActions(indices);
+    public static bool DisableActions(this PlayMakerFSM fsm, string stateName, params int[] indices) => fsm.MustGetState(stateName).DisableActions(indices);
 
     /// <inheritdoc cref="DisableActions(PlayMakerFSM, string, int[])"/>
     [PublicAPI]
-    public static bool DisableActions(this Fsm fsm, string stateName, params int[] indices) => fsm.GetState(stateName)!.DisableActions(indices);
+    public static bool DisableActions(this Fsm fsm, string stateName, params int[] indices) => fsm.MustGetState(stateName).DisableActions(indices);
 
     /// <inheritdoc cref="DisableActions(PlayMakerFSM, string, int[])"/>
     /// <param name="state">The fsm state</param>
@@ -1415,11 +1506,11 @@ public static void DisableActionsOfType<TAction>(this Fsm fsm)
     /// <param name="fsm">The fsm</param>
     /// <param name="stateName">The name of the state to disable the actions from</param>
     [PublicAPI]
-    public static void DisableActionsOfType<TAction>(this PlayMakerFSM fsm, string stateName) => fsm.GetState(stateName)!.DisableActionsOfType<TAction>();
+    public static void DisableActionsOfType<TAction>(this PlayMakerFSM fsm, string stateName) => fsm.MustGetState(stateName).DisableActionsOfType<TAction>();
 
     /// <inheritdoc cref="DisableActionsOfType{TAction}(PlayMakerFSM, string)"/>
     [PublicAPI]
-    public static void DisableActionsOfType<TAction>(this Fsm fsm, string stateName) => fsm.GetState(stateName)!.DisableActionsOfType<TAction>();
+    public static void DisableActionsOfType<TAction>(this Fsm fsm, string stateName) => fsm.MustGetState(stateName).DisableActionsOfType<TAction>();
 
     /// <inheritdoc cref="DisableActionsOfType{TAction}(PlayMakerFSM, string)"/>
     /// <param name="state">The fsm state</param>