diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs
index a030bedb..c2275df1 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs
@@ -521,6 +521,7 @@ namespace VEPROMS.CSLA.Library
 				if (!orig.ContainsKey(key)) orig.Add(key, fi.ImageID);
 			}
 			i = 0;
+			if (rofst.ROFstFigures == null) return null;// B2018-032 Don't crash if there are no figures
 			foreach (FigureInfo fi in rofst.ROFstFigures)
 			{
 				string key = fi.ROImage_FileName ?? fi.MyROImage.FileName;