diff --git a/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs b/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs
index 49ff5c5d..b629122b 100644
--- a/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs
+++ b/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs
@@ -776,9 +776,16 @@ namespace ZUGFeRDRESTService.Controllers
         {
             try
             {
-                var delItemValueSQL = "DELETE FROM TBEDMI_ITEM_VALUE WHERE REFERENCE_GUID '" + pMessageId + "';";
+                var delItemValueSQL = "DELETE FROM TBEDMI_ITEM_VALUE WHERE REFERENCE_GUID = '" + pMessageId + "';";
                 var oCommand = new SqlCommand(delItemValueSQL);
-                _database.MSSQL.ExecuteNonQuery(oCommand);
+                var retValue = _database.MSSQL.ExecuteNonQuery(oCommand);
+
+                if (!retValue)
+                {
+                    _logger.Warn("DELETE FROM TBEDMI_ITEM_VALUE NOT successfull");
+                    return false;
+                }
+
                 _logger.Debug("DELETE FROM TBEDMI_ITEM_VALUE successfull");
             }
             catch (Exception ex)
@@ -789,9 +796,15 @@ namespace ZUGFeRDRESTService.Controllers
 
             try
             {
-                var delItemFilesSQL = "DELETE FROM TBEDMI_ITEM_FILES WHERE REFERENCE_GUID '" + pMessageId + "';";
+                var delItemFilesSQL = "DELETE FROM TBEDMI_ITEM_FILES WHERE REFERENCE_GUID = '" + pMessageId + "';";
                 var oCommand = new SqlCommand(delItemFilesSQL);
-                _database.MSSQL.ExecuteNonQuery(oCommand);
+                var retValue = _database.MSSQL.ExecuteNonQuery(oCommand);
+
+                if (!retValue)
+                {
+                    _logger.Warn("DELETE FROM TBEDMI_ITEM_FILES NOT successfull");
+                    return false;
+                }
                 _logger.Debug("DELETE FROM TBEDMI_ITEM_FILES successfull");
             }
             catch (Exception ex)