diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 4ed214f63..7b5d49baf 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		nginx
 PLUGIN_VERSION=		1.34
-PLUGIN_REVISION=	2
+PLUGIN_REVISION=	3
 PLUGIN_COMMENT=		Nginx HTTP server and reverse proxy
 PLUGIN_DEPENDS=		nginx
 PLUGIN_MAINTAINER=	franz.fabian.94@gmail.com
diff --git a/www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NgxBusyBufferConstraint.php b/www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NgxBusyBufferConstraint.php
index 409dfa6f2..83491dbff 100644
--- a/www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NgxBusyBufferConstraint.php
+++ b/www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NgxBusyBufferConstraint.php
@@ -43,24 +43,25 @@ class NgxBusyBufferConstraint extends BaseConstraint
         $node = $this->getOption('node');
         if ($node) {
             $parentNode = $node->getParentNode();
-            if (!$this->isEmpty($node)) {
+            if (!$node->isEmpty()) {
                 $proxy_buffer_size_node = $parentNode->proxy_buffer_size;
                 $proxy_buffers_count_node = $parentNode->proxy_buffers_count;
                 $proxy_buffers_size_node = $parentNode->proxy_buffers_size;
                 $proxy_busy_buffers_size_node = $parentNode->proxy_busy_buffers_size;
 
-                if (!$this->isEmpty($proxy_buffers_count_node) && !$this->isEmpty($proxy_buffers_size_node)) {
+                if (!is_null($proxy_buffers_count_node) && !$proxy_buffers_count_node->isEmpty() &&
+                    !is_null($proxy_buffers_size_node) && !$proxy_buffers_size_node->isEmpty()) {
                     $proxy_buffers_count_int = intval((string) $proxy_buffers_count_node);
                     $proxy_buffers_size_int = intval((string) $proxy_buffers_size_node);
 
                     $proxy_buffers_total_minus1_size = ($proxy_buffers_count_int - 1) * $proxy_buffers_size_int;
                 }
 
-                if (!$this->isEmpty($proxy_busy_buffers_size_node)) {
+                if (!is_null($proxy_busy_buffers_size_node) && !$proxy_busy_buffers_size_node->isEmpty()) {
                     $proxy_busy_buffers_size = intval((string) $proxy_busy_buffers_size_node);
                 }
 
-                if (!$this->isEmpty($proxy_buffer_size_node)) {
+                if (!is_null($proxy_buffer_size_node) && !$proxy_buffer_size_node->isEmpty()) {
                     $proxy_buffer_size_int = intval((string) $proxy_buffer_size_node);
                 }
 
diff --git a/www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NgxUniqueDefaultServerConstraint.php b/www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NgxUniqueDefaultServerConstraint.php
index 433d2b101..4393425f4 100644
--- a/www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NgxUniqueDefaultServerConstraint.php
+++ b/www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NgxUniqueDefaultServerConstraint.php
@@ -45,7 +45,7 @@ class NgxUniqueDefaultServerConstraint extends BaseConstraint
         if ($node) {
             $httpServerNode = $node->getParentNode();
             $defaultServerNode = $httpServerNode->getChild("default_server");
-            if (!$this->isEmpty($defaultServerNode)) {
+            if (!$defaultServerNode->isEmpty()) {
                 $myUUID = $httpServerNode->getAttribute("uuid");
                 $myListenHTTPAddress = $httpServerNode->getChild("listen_http_address");
 
@@ -58,7 +58,7 @@ class NgxUniqueDefaultServerConstraint extends BaseConstraint
                     $uuid = $httpServer->getAttribute("uuid");
                     if ($uuid != $myUUID) {
                         $defaultServerNode = $httpServer->getChild("default_server");
-                        if (!$this->isEmpty($defaultServerNode)) {
+                        if (!$defaultServerNode->isEmpty()) {
                             $listenHTTPAddressNode = $httpServer->getChild("listen_http_address");
                             if ($this->compareListenAddresses($myListenHTTPAddress, $listenHTTPAddressNode, $msg)) {
                                 $validator->appendMessage(new Message(