diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/TransformContext.cs b/ICSharpCode.Decompiler/CSharp/Transforms/TransformContext.cs
index 31dd4f263..13fafaf58 100644
--- a/ICSharpCode.Decompiler/CSharp/Transforms/TransformContext.cs
+++ b/ICSharpCode.Decompiler/CSharp/Transforms/TransformContext.cs
@@ -120,7 +120,7 @@ namespace ICSharpCode.Decompiler.CSharp.Transforms
 		[Conditional("STEP")]
 		internal void EndStep(AstNode? modifiedNode)
 		{
-			if (Stepper.LastStep != null)
+			if (Stepper.LastStep != null && modifiedNode != null)
 			{
 				Stepper.LastStep.ModifiedNode = modifiedNode;
 				TrackModifiedNode(Stepper.LastStep, modifiedNode, insertFirst: true);