diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index 36266a0de..29fa16b2e 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -826,7 +826,8 @@ FW_answerCall($)
 sub
 FW_addLinks($)
 {
-  my @lines = split( /\n/, shift); # Adding links
+  return undef if(!defined($_[0]));
+  my @lines = split( /\n/, $_[0]); # Adding links
   my $ret = "";
   foreach my $line (@lines) {
     $ret .= "\n" if( $ret );
diff --git a/fhem/www/pgm2/fhemweb.js b/fhem/www/pgm2/fhemweb.js
index 0e301fca1..a8e6aef17 100644
--- a/fhem/www/pgm2/fhemweb.js
+++ b/fhem/www/pgm2/fhemweb.js
@@ -127,7 +127,8 @@ FW_jqueryReadyFn()
       cmd += (cmd?"&":"")+$(this).attr("name")+"="+$(this).val();
     });
     FW_cmd(FW_root+"?"+cmd+"&XHR=1&addLinks=1", function(data) {
-      FW_okDialog('<pre>'+data+'</pre>', el);
+      if(!data.match(/^[\r\n]*$/)) // ignore empty answers
+        FW_okDialog('<pre>'+data+'</pre>', el);
     });
   });