diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs
index 7f529970..99a9d15b 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
@@ -41,9 +41,9 @@ namespace VEPROMS
 			{
 				_SelectedStepTabPanel = value;
 				if (value == null) // DSO Tab Panel
-					SelectedDVI = (DocVersionInfo)tc.SelectedDisplayTabItem.MyItemInfo.MyActiveParent.ActiveParent;
+					SelectedDVI = tc.SelectedDisplayTabItem.MyItemInfo.MyActiveParent.ActiveParent as DocVersionInfo;
 				else // Step Tab Panel
-					SelectedDVI = (DocVersionInfo)value.MyStepPanel.MyProcedureItemInfo.MyProcedure.MyActiveParent;
+					SelectedDVI = value.MyStepPanel.MyProcedureItemInfo.MyProcedure.MyActiveParent as DocVersionInfo;
 			}
 		}
 		public DocVersionInfo SelectedDVI