From a6e07e9b52744a7b5738a1b60eceb625f5ef49b3 Mon Sep 17 00:00:00 2001
From: John <jjenko@volian.com>
Date: Tue, 4 Dec 2012 15:32:52 +0000
Subject: [PATCH] Bug fix B2012-334, program would sometimes terminate when
 using the Enter key to enter step data

---
 PROMS/Volian.Controls.Library/StepTabRibbon.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
index 5bc671ea..dd2fc12f 100644
--- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs
+++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
@@ -1806,7 +1806,8 @@ namespace Volian.Controls.Library
 					InsertSiblingBeforeOrAfter("after");
 				else if (deletedRNO)
 				{
-					if (MyItemInfo.SearchNext.IsTable)
+					
+					if (MyItemInfo.SearchNext != null && MyItemInfo.SearchNext.IsTable)
 						MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlDown);
 					else
 						InsertSiblingBeforeOrAfter("after");
@@ -1846,7 +1847,7 @@ namespace Volian.Controls.Library
 				{
 					if (deletedSubStep)
 						SetShortCutContextMenu("InsHLS");
-					else if (next.IsFirstSubStep)
+					else if (next != null && next.IsFirstSubStep)
 					{
 						MyEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(next);
 						InsertSiblingBeforeOrAfter("before");