diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs
index 6b773e13..6455b32b 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs
@@ -207,6 +207,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			string rofstfilepath = rdi.FolderPath + @"\ro.fst";
 			DirectoryInfo di = new DirectoryInfo(rdi.FolderPath);
+			if (!di.Exists) return null;
 
 			// check if this rofst has been loaded, i.e. dts on file versus dts in db...
 			// if so, just make association with docversion.
@@ -525,7 +526,7 @@ namespace VEPROMS.CSLA.Library
 				if (myROImagesList.ContainsKey(key))
 				{
 					int imageID = myROImagesList[key];
-					if(myROImageIDs.Contains(imageID))
+					if(!myROImageIDs.Contains(imageID))
 						myROImageIDs.Add(imageID);
 				}
 				else