diff --git a/include/dvb.class.php b/include/dvb.class.php
index 994896bc6..7afd30c23 100644
--- a/include/dvb.class.php
+++ b/include/dvb.class.php
@@ -449,7 +449,7 @@ class dvb extends basis_db
 			else
 			{
 				$this->errormsg = '';
-				return ErrorHandler::success();
+				return ErrorHandler::error();
 			}
 		}
 		else
@@ -606,7 +606,7 @@ class dvb extends basis_db
 			else
 			{
 				$this->errormsg = '';
-				return ErrorHandler::success();
+				return ErrorHandler::error();
 			}
 		}
 		else
diff --git a/soap/datenverbund_client.php b/soap/datenverbund_client.php
index 5bcd904e0..378ee87b7 100644
--- a/soap/datenverbund_client.php
+++ b/soap/datenverbund_client.php
@@ -276,7 +276,7 @@ if (isset($_REQUEST['submit']))
 			break;
 	}
 	if (isset($_POST['debug']))
-		echo '<div style="color: gray">'.$dvb->debug_output.'</div>';
+		echo '<div style="color: gray">'.nl2br(htmlentities($dvb->debug_output)).'</div>';
 }
 
 ?>