diff --git a/icinga-cli.sh b/icinga-cli.sh
index d1f9e138bf57e7408120a86058301bba5380315c..5205109647773867d42e049108af8db67d406675 100755
--- a/icinga-cli.sh
+++ b/icinga-cli.sh
@@ -362,9 +362,10 @@ function processCheck(){
       iPipes=$( sed 's#[^|]##g' "$_outfile" | grep "." | wc -L )
       _echo "Pipe chars: $iPipes"
       if [[ $iPipes -gt 1 ]]; then
-        _elog "ABORT - pipes were found in plugin output"
+        _elog "WARNING - pipes were found in plugin output"
         _elog "command was: $myFullscript $myparams"
-        exit 1
+        _log "${_logPrefix} WARNING - pipes were found in plugin output"
+        sed -i "s#|#:#g" "$_outfile"
       fi
 
       _echo
@@ -372,9 +373,10 @@ function processCheck(){
       # echo $outPerfdata
       # echo
       if ! test -n "$outPerfdata" && echo "$outPerfdata" | grep "=[0-9\.]*;[0-9\.]*;[0-9\.]*;[0-9\.]*;" >/dev/null; then
-        _elog "ABORT - this does not look like performance data: $outPerfdata"
+        _elog "WARNING - this does not look like performance data: $outPerfdata"
         _elog "command was: $myFullscript $myparams"
-        exit 1
+        _log "${_logPrefix} this does not look like performance data: $outPerfdata"
+        outPerfdata=""
       fi
       _log "${_logPrefix} check command finished with returncode $rc"