diff --git a/coeus-s2sgen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/generate/FormGeneratorServiceImpl.java b/coeus-s2sgen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/generate/FormGeneratorServiceImpl.java
index a7b019d8..0c2ef342 100644
--- a/coeus-s2sgen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/generate/FormGeneratorServiceImpl.java
+++ b/coeus-s2sgen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/generate/FormGeneratorServiceImpl.java
@@ -129,9 +129,9 @@ protected FormGenerationResult generateAndValidateForms(Forms forms,
             if(info==null) continue;
 			String namespace = info.getNameSpace();
             S2SFormGenerator s2sFormGenerator = s2SFormGeneratorService.getS2SGenerator(developmentProposal.getProposalNumber(),namespace);
-            auditErrors.addAll(s2sFormGenerator.getAuditErrors());
 			try {
 				XmlObject formObject = s2sFormGenerator.getFormObject(pdDoc);
+                auditErrors.addAll(s2sFormGenerator.getAuditErrors());
 				if (s2SValidatorService.validate(formObject, auditErrors, info.getFormName())) {
 					if (forms != null && attList != null) {
 						setFormObject(forms, formObject);
diff --git a/coeus-s2sgen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/print/FormPrintServiceImpl.java b/coeus-s2sgen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/print/FormPrintServiceImpl.java
index d2445abc..fa0a3ca1 100644
--- a/coeus-s2sgen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/print/FormPrintServiceImpl.java
+++ b/coeus-s2sgen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/print/FormPrintServiceImpl.java
@@ -367,9 +367,8 @@ protected PrintableResult getPDFStream(ProposalDevelopmentDocumentContract pdDoc
             FormMappingInfo info = formMappingService.getFormInfo(namespace,proposalNumber);
 			if(info==null) continue;
             S2SFormGenerator s2sFormGenerator = s2SFormGeneratorService.getS2SGenerator(proposalNumber,info.getNameSpace());
-            errors.addAll(s2sFormGenerator.getAuditErrors());
 			XmlObject formObject = s2sFormGenerator.getFormObject(pdDoc);
-			
+			errors.addAll(s2sFormGenerator.getAuditErrors());
 			if (s2SValidatorService.validate(formObject, errors, info.getFormName()) && errors.isEmpty() && StringUtils.isNotBlank(info.getStyleSheet())) {
 			    String applicationXml = formObject.xmlText(s2SFormGeneratorService.getXmlOptionsPrefixes());
 			    String filteredApplicationXml = s2SDateTimeService.removeTimezoneFactor(applicationXml);
diff --git a/coeus-s2sgen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/print/S2SPrintingServiceImpl.java b/coeus-s2sgen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/print/S2SPrintingServiceImpl.java
index b20b7d2b..57dd9d5c 100644
--- a/coeus-s2sgen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/print/S2SPrintingServiceImpl.java
+++ b/coeus-s2sgen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/print/S2SPrintingServiceImpl.java
@@ -219,7 +219,7 @@ protected boolean isPdfGoodToMerge(byte[] pdfBytes) {
             return true;
         }
         catch (IOException e) {
-            return false;
+            throw new S2SException(e);
         }
     }