diff --git a/PROMS/Volian.Controls.Library/DisplayText.cs b/PROMS/Volian.Controls.Library/DisplayText.cs
index ebeb500d..81464e88 100644
--- a/PROMS/Volian.Controls.Library/DisplayText.cs
+++ b/PROMS/Volian.Controls.Library/DisplayText.cs
@@ -603,6 +603,7 @@ namespace Volian.Controls.Library
 			retval = Regex.Replace(retval, @"^\{(.*)\}$", "$1", RegexOptions.Singleline); // Strip Opening and Closing Braces
 			retval = Regex.Replace(retval, @"\{[^{]*?\}", "", RegexOptions.Singleline); // Strip Clauses - remove anything from curly braces
 			retval = Regex.Replace(retval, @"\{[^{]*?\}", "", RegexOptions.Singleline); // Strip Clauses - remove anything from curly braces
+			retval = Regex.Replace(retval, @"\\v\\f[0-9] ", "\\v ");	// remove font command - if next to Comment keep space
 			retval = Regex.Replace(retval, @"\\f[0-9] ", "");	// remove font command with ending space
 			retval = Regex.Replace(retval, @"\\f[0-9]", "");	// remove font command without ending space
 			retval = Regex.Replace(retval, @"\\par ", "\r\n");
diff --git a/PROMS/Volian.Controls.Library/DisplayTransition.cs b/PROMS/Volian.Controls.Library/DisplayTransition.cs
index ec6abf77..b6e54a79 100644
--- a/PROMS/Volian.Controls.Library/DisplayTransition.cs
+++ b/PROMS/Volian.Controls.Library/DisplayTransition.cs
@@ -126,7 +126,11 @@ namespace Volian.Controls.Library
 			// if modify, use the first transition to, _CurTrans
 			// This item will be either a procedure, section or step, never a docversion
 			ItemInfo selitm = _CurTrans==null?_CurItemFrom:_CurTrans.MyItemToID;
- 
+			// If this points to an invalid transtion, make it point to itself.
+			if (selitm.PreviousID == null && selitm.ItemPartCount == 0 && selitm.ItemDocVersionCount == 0)
+			{
+				selitm = _CurItemFrom;
+			}
 			ItemInfo tmpitm = selitm;
 			ItemInfo secitm = null;
 
diff --git a/PROMS/Volian.Controls.Library/MostRecentItem.cs b/PROMS/Volian.Controls.Library/MostRecentItem.cs
index 9e786e92..f222eed7 100644
--- a/PROMS/Volian.Controls.Library/MostRecentItem.cs
+++ b/PROMS/Volian.Controls.Library/MostRecentItem.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using VEPROMS.CSLA.Library;
+using System.Windows.Forms;
 
 namespace Volian.Controls.Library
 {
@@ -31,7 +32,13 @@ namespace Volian.Controls.Library
 		}
 		public MostRecentItem Add(int itemID)
 		{
-			return Add(new MostRecentItem(ItemInfo.Get(itemID)));
+			ItemInfo tmp = ItemInfo.Get(itemID);
+			if (tmp == null)
+			{
+				MessageBox.Show("This step no longer exists", "Invalid Most Recent Item", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+				return null;
+			}
+			return Add(new MostRecentItem(tmp));
 		}
 		public MostRecentItem Add(ItemInfo myItem)
 		{