diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs
index 2679525c..6506739d 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
@@ -2889,6 +2889,7 @@ namespace VEPROMS
 		}
 		private void tc_PanelTabDisplay(object sender, StepPanelTabDisplayEventArgs args)
 		{
+			if (_SelectedDVI == null) return;
 			if (args.PanelTabName == "Bookmarks")
 			{
 				toolsPanel.Expanded = true;
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs
index 6aff2310..4b645c70 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs
@@ -391,16 +391,19 @@ namespace VEPROMS.CSLA.Library
 		/// <param name="roids">List of ROIDs with changed figures</param>
 		private static void FindChangedFiles(ROFSTLookup.rochild[] rochild,List<string> ChangedFiles, List<string> roids)
 		{
-			for (int i = 0; i < rochild.Length; i++)
+			if (ChangedFiles != null)
 			{
-				if (rochild[i].type == 8 && rochild[i].value != null)
+				for (int i = 0; i < rochild.Length; i++)
 				{
-					string filename = rochild[i].value;
-					filename = filename.Substring(0, filename.IndexOf('\n'));
-					if(ChangedFiles.Contains(filename))
-					roids.Add(rochild[i].roid);
+					if (rochild[i].type == 8 && rochild[i].value != null)
+					{
+						string filename = rochild[i].value;
+						filename = filename.Substring(0, filename.IndexOf('\n'));
+						if (ChangedFiles.Contains(filename))
+							roids.Add(rochild[i].roid);
+					}
+					if (rochild[i].children != null) FindChangedFiles(rochild[i].children, ChangedFiles, roids);
 				}
-				if (rochild[i].children != null) FindChangedFiles(rochild[i].children,ChangedFiles, roids);
 			}
 		}
 		/// <summary>
@@ -411,6 +414,7 @@ namespace VEPROMS.CSLA.Library
 		/// <returns>List of Files which have changed (DTS)</returns>
 		private static List<string> GetChangedFigures(ROFstInfo origROFst, ROFstInfo rofst)
 		{
+			if (origROFst.ROFstFigures == null) return null;
 			Dictionary<string,int> orig = new Dictionary<string,int>();
 			foreach (FigureInfo fi in origROFst.ROFstFigures)
 			{
@@ -463,6 +467,7 @@ namespace VEPROMS.CSLA.Library
 			List<string> delList = new List<string>();
 			List<string> chgList = newLU.GetValueDifferences(origLU, ref delList);
 			// Any figures which have been changed will be included in the list of values that have changed.
+			if (MyChangedFigureROIDs != null)
 			foreach (string roid in MyChangedFigureROIDs)
 				if (!chgList.Contains(roid))
 					chgList.Add(roid);
@@ -522,7 +527,7 @@ namespace VEPROMS.CSLA.Library
 				foreach (string chg in chgList)
 				{
 					string padroid = chg.Length <= 12 ? chg + "0000" : chg;
-					if (myProgressBarRefresh != null) myProgressBarRefresh(++iCount, chgList.Count, "Updating DRO Values");
+					if (myProgressBarRefresh != null) myProgressBarRefresh(++iCount, chgList.Count, "Updating RO Values");
 					if (activeDRoids.Contains(chg.Substring(0, 12)))
 					{
 						ROFSTLookup.rochild roch = newLU.GetRoChild(chg);
@@ -587,7 +592,7 @@ namespace VEPROMS.CSLA.Library
 						{
 							foreach (DROUsageInfo droUsg in Daffected)
 							{
-								if (myProgressBarRefresh != null) myProgressBarRefresh(++iCount, chgList.Count, "Removing Old DRO Values");
+								if (myProgressBarRefresh != null) myProgressBarRefresh(++iCount, chgList.Count, "Removing Old RO Values");
 								Pdf.DeleteAll(droUsg.DocID);
 							}
 						}