diff --git a/LEAF_Request_Portal/js/dialogController.js b/LEAF_Request_Portal/js/dialogController.js
index 3eb225312..114605460 100644
--- a/LEAF_Request_Portal/js/dialogController.js
+++ b/LEAF_Request_Portal/js/dialogController.js
@@ -39,7 +39,9 @@ function dialogController(containerID, contentID, loadIndicatorID, btnSaveID, bt
     $('#' + this.btnCancelID).on('click', function() {
     	t.hide();
     });
-	document.querySelector('#' + this.btnCancelID).removeAttribute('disabled');
+	if(document.getElementById(this.btnCancelID) !== null) {
+		document.getElementById(this.btnCancelID).removeAttribute('disabled');
+	}
     $('button.ui-dialog-titlebar-close').on('click', function() {
         t.hide();
     });
diff --git a/LEAF_Request_Portal/sources/FormStack.php b/LEAF_Request_Portal/sources/FormStack.php
index 45987f8ae..9665447aa 100644
--- a/LEAF_Request_Portal/sources/FormStack.php
+++ b/LEAF_Request_Portal/sources/FormStack.php
@@ -194,6 +194,10 @@ private function importIndicator($indicatorPackage, $categoryID, $parentID = nul
     {
         $indicatorPackage['categoryID'] = $categoryID;
         $indicatorPackage['parentID'] = $parentID;
+        //an issue on conditions editor release could cause some form packets to have 'null' instead of null.
+        if($indicatorPackage['conditions'] === 'null') {
+            $indicatorPackage['conditions'] = null;
+        }
 
         if (is_array($indicatorPackage['options']))
         {
diff --git a/LEAF_Request_Portal/templates/print_subindicators.tpl b/LEAF_Request_Portal/templates/print_subindicators.tpl
index 3b8b29adc..415ed3f60 100644
--- a/LEAF_Request_Portal/templates/print_subindicators.tpl
+++ b/LEAF_Request_Portal/templates/print_subindicators.tpl
@@ -14,10 +14,12 @@
     <!--{foreach from=$form item=indicator}-->
                 <!--{if $indicator.conditions != '' && $indicator.conditions !== 'null'}-->
                 <script type="text/javascript">
-                    formPrintConditions["id<!--{$indicator.indicatorID}-->"] = {
-                        conditions:<!--{$indicator.conditions|strip_tags}-->,
-                        format:'<!--{$indicator.format}-->'
-                    };
+                    if (typeof formPrintConditions !== 'undefined') {
+                        formPrintConditions["id<!--{$indicator.indicatorID}-->"] = {
+                            conditions:<!--{$indicator.conditions|strip_tags}-->,
+                            format:'<!--{$indicator.format}-->'
+                        };
+                    }
                 </script>
                 <!--{/if}-->
                 <!--{if $indicator.format == null || $indicator.format == 'textarea'}-->
diff --git a/LEAF_Request_Portal/templates/subindicators.tpl b/LEAF_Request_Portal/templates/subindicators.tpl
index 697fec56c..75a68f434 100644
--- a/LEAF_Request_Portal/templates/subindicators.tpl
+++ b/LEAF_Request_Portal/templates/subindicators.tpl
@@ -1237,7 +1237,7 @@
             <!--{$indicator.html}-->
         <!--{/if}-->
         <!--{include file=$subindicatorsTemplate form=$indicator.child depth=$depth+4 recordID=$recordID}-->
-        <!--{if $indicator.conditions != ''}-->
+        <!--{if $indicator.conditions != '' && $indicator.conditions != 'null'}-->
             <script type="text/javascript">
                 formConditions["id<!--{$indicator.indicatorID}-->"] = {
                     conditions:<!--{$indicator.conditions|strip_tags}-->,  //no quotes. send as object