diff --git a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
index 4d0690c..9d300f9 100644
--- a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
+++ b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
@@ -13,14 +13,14 @@
 
 \JHtml::_('stylesheet', 'com_patchtester/octicons.css', array(), true);
 
+if (count($this->envErrors)) :
+	$this->loadTemplate('errors');
+else :
 $listOrder     = $this->escape($this->state->get('list.ordering'));
 $listDirn      = $this->escape($this->state->get('list.direction'));
 $filterApplied = $this->escape($this->state->get('filter.applied'));
 $sortFields    = $this->getSortFields();
 
-if (count($this->envErrors)) :
-	$this->loadTemplate('errors');
-else :
 \JFactory::getDocument()->addScriptDeclaration(
 	"
 	var submitpatch = function (task, id) {
diff --git a/administrator/templates/hathor/html/com_patchtester/pulls/default.php b/administrator/templates/hathor/html/com_patchtester/pulls/default.php
index 097ad07..5d2e4f7 100644
--- a/administrator/templates/hathor/html/com_patchtester/pulls/default.php
+++ b/administrator/templates/hathor/html/com_patchtester/pulls/default.php
@@ -13,6 +13,9 @@
 
 \JHtml::_('stylesheet', 'com_patchtester/octicons.css', array(), true);
 
+if (count($this->envErrors)) :
+	$this->loadTemplate('errors');
+else :
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $filterApplied = $this->escape($this->state->get('filter.applied'));
@@ -106,3 +109,4 @@ echo JHtmlBootstrap::renderModal(
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
 </form>
+<?php endif;