diff --git a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs
index de49c4d2..4c5e547b 100644
--- a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs
+++ b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs
@@ -4031,7 +4031,7 @@ namespace Volian.Controls.Library
 						if (rC > c)
 						{
 							this.MergedRanges.Add(this.GetCellRange(r, c, r, rC));
-							string cellstr = this[r, c].ToString();
+							string cellstr = (this[r,c]==null)? " ": this[r, c].ToString();
 							for (int x = c + 1; x <= rC; x++)
 								this[r, x] = cellstr;
 							c = rC;
diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs
index 91fb7ff6..41c50431 100644
--- a/PROMS/Volian.Print.Library/Pagination.cs
+++ b/PROMS/Volian.Print.Library/Pagination.cs
@@ -28,6 +28,10 @@ namespace Volian.Print.Library
 		/// </returns>
 		private int Paginate(float yLocation, float yTopMargin, float yBottomMargin)
 		{
+			// Check if paginate on a separate section, if within a section.  Top level section pagination happens in PromsPrinter
+			if (MyItemInfo.IsSection && MyParent != null && MyParent.MyItemInfo.IsSection && (MyItemInfo as SectionInfo).IsSeparatePagination())
+				return 1;    
+
 			float yPageSize = yTopMargin - yBottomMargin;
 
 			// TODO: This does not account for a long step as the last step that would exceed more than one page and
@@ -358,7 +362,11 @@ namespace Volian.Print.Library
 			switch (docstyle.Continue.Bottom.Location)
 			{
 				case E_ContBottomLoc.BottomOfPage:				// place continue message at bottom of page
-					myBottomMsgSpace = 0;
+					// The following format flag was added for FNP, without the flag (which stops the reset of BottomMsgSpace)
+					//  a number of FNP procedures had overwritten steps/bottom continue message.  An example can be
+					//  found in FNP = SAMGS;FNP-1-SACRG-2, step 1.
+					if (!docstyle.Continue.Bottom.NoOverrideSpace)
+						myBottomMsgSpace = 0;	
 					break;
 			}
 			string myTopMsg = docstyle.Continue.Top.Message;