diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs
index 0510ada3..7fc086ee 100644
--- a/PROMS/Volian.Controls.Library/EditItem.cs
+++ b/PROMS/Volian.Controls.Library/EditItem.cs
@@ -1666,6 +1666,7 @@ namespace Volian.Controls.Library
 			//    _NextDownEditItemPath);
 			if (nextEditItem != null)
 			{
+				if (MyStepPanel.ExpandingHLS != null && nextEditItem.MyItemInfo.IsSection) return;   // without this, if next item is section, it crashes on null reference
 				if (MyStepPanel.ExpandingHLS != null && nextEditItem.MyItemInfo.MyHLS.ItemID != MyStepPanel.ExpandingHLS.ItemID)
 					return;
 				int bottom = nextEditItem.FindTop(Bottom);