diff --git a/PROMS/Formats/fmtall/BGESAM1all.xml b/PROMS/Formats/fmtall/BGESAM1all.xml
index 31cd9046..ea5e7586 100644
Binary files a/PROMS/Formats/fmtall/BGESAM1all.xml and b/PROMS/Formats/fmtall/BGESAM1all.xml differ
diff --git a/PROMS/Formats/fmtall/BGESTPall.xml b/PROMS/Formats/fmtall/BGESTPall.xml
index f3b4d4b1..fd63dcae 100644
Binary files a/PROMS/Formats/fmtall/BGESTPall.xml and b/PROMS/Formats/fmtall/BGESTPall.xml differ
diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs
index 0895f3d3..c2699294 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
@@ -1074,7 +1074,8 @@ namespace VEPROMS
 		{
 			// B2017-212  If the user uses the X button in Word to close the word attachment, PROMS thinks that the user wants to close out of PROMS as well
 			//            trap for this and close only the Word tab in PROMS
-			if (tc.SelectedDisplayTabItem.MyDSOTabPanel != null)
+			// B2017-214 added a null reference check
+			if (tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.MyDSOTabPanel != null)
 			{
 				string stk = Volian.Base.Library.vlnStackTrace.StackToString();
 				if (!stk.Contains("MouseUp") && !stk.Contains("ButtonDown") && !stk.Contains("Exception"))