diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php
index fab25c571..cf52df5e6 100644
--- a/include/lib/ac_common.php
+++ b/include/lib/ac_common.php
@@ -1545,7 +1545,7 @@ function noalyss_strlentrim($p_string) :int {
 }
 function noalyss_str_replace($search,$replace,$string) {
     if ($string===null) return "";
-    else return str_replace($search,$replace,$string);
+    else return str_replace($search,$replace??"",$string);
 }
 function noalyss_bcsub($p_first,$p_second)
 {
diff --git a/include/lib/inplace_edit.class.php b/include/lib/inplace_edit.class.php
index 4b9396f64..6e631320e 100644
--- a/include/lib/inplace_edit.class.php
+++ b/include/lib/inplace_edit.class.php
@@ -141,7 +141,7 @@ EOF;
     function input() {
         ob_start();
         $v=$this->input->get_value();
-        $v=html_entity_decode($v);
+        $v=html_entity_decode($v??"");
         if ( $this->input instanceof ITextarea) {
             echo '<span class="" id="'.$this->input->id.'edit" >';
             echo '<pre class="field_follow_up">';