diff --git a/scripts/pi-hole/js/utils.js b/scripts/pi-hole/js/utils.js
index d47473cf..cdc4bead 100644
--- a/scripts/pi-hole/js/utils.js
+++ b/scripts/pi-hole/js/utils.js
@@ -17,6 +17,8 @@ function escapeHtml(text) {
     "'": "'"
   };
 
+  if (text === null) return null;
+
   return text.replace(/[&<>"']/g, function (m) {
     return map[m];
   });
@@ -31,6 +33,8 @@ function unescapeHtml(text) {
     "&#039;": "'"
   };
 
+  if (text === null) return null;
+
   return text.replace(/&(?:amp|lt|gt|quot|#039);/g, function (m) {
     return map[m];
   });
diff --git a/settings.php b/settings.php
index c8cbe922..a17309e3 100644
--- a/settings.php
+++ b/settings.php
@@ -14,7 +14,7 @@ $piholeFTLConf = piholeFTLConfig();
 
 // Handling of PHP internal errors
 $last_error = error_get_last();
-if($last_error["type"] === E_WARNING || $last_error["type"] === E_ERROR)
+if(isset($last_error) && ($last_error["type"] === E_WARNING || $last_error["type"] === E_ERROR))
 {
 	$error .= "There was a problem applying your settings.<br>Debugging information:<br>PHP error (".htmlspecialchars($last_error["type"])."): ".htmlspecialchars($last_error["message"])." in ".htmlspecialchars($last_error["file"]).":".htmlspecialchars($last_error["line"]);
 }