diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs
index b82e6f3c..038a258e 100644
--- a/PROMS/Volian.Controls.Library/DisplayRO.cs
+++ b/PROMS/Volian.Controls.Library/DisplayRO.cs
@@ -614,7 +614,7 @@ namespace Volian.Controls.Library
 					AddDummyGroup(db, tn);
 				}
 
-				_currRofstID = (int?)MyROFST.ROFstID;
+				_currRofstID = (IsRofstValid) ? (int?)_myROFST.ROFstID : null;
 				_currDocVersionID = null;
 
 				if(_docVersionInfo != null) _currDocVersionID = (int?)_docVersionInfo.VersionID;
@@ -789,7 +789,7 @@ namespace Volian.Controls.Library
 
 		private void AddDummyGroup(ROFSTLookup.rodbi rodbi, TreeNode tn)
 		{
-			if (MyROFSTLookup.HasChildren(ref rodbi))
+			if (IsRofstValid && MyROFSTLookup.HasChildren(ref rodbi))
 			{
 				TreeNode tmp = new TreeNode(DummyNodeText);
 				tn.Nodes.Add(tmp);