diff --git a/PROMS/Volian.Controls.Library/StepPanel.cs b/PROMS/Volian.Controls.Library/StepPanel.cs
index bdf54274..4bb45f09 100644
--- a/PROMS/Volian.Controls.Library/StepPanel.cs
+++ b/PROMS/Volian.Controls.Library/StepPanel.cs
@@ -495,6 +495,11 @@ namespace Volian.Controls.Library
 						}
 						float oldTop = lastEI.Top;
 						EditItem newFocus = lastEI.DeleteItem();
+						if (newFocus == null)
+						{
+							lastEI.RefreshContent();
+							return;
+						}
 						float newTop = newFocus.Top;
 						lastEI.Dispose();
 						newFocus.SetAllTabs();