diff --git a/engine/cdrs.go b/engine/cdrs.go
index 90236e8ea..873aa3c10 100644
--- a/engine/cdrs.go
+++ b/engine/cdrs.go
@@ -189,6 +189,7 @@ func (self *CdrServer) processCdr(storedCdr *StoredCdr) (err error) {
 	if self.cgrCfg.CDRSStoreCdrs { // Store RawCDRs, this we do sync so we can reply with the status
 		if err := self.cdrDb.SetCdr(storedCdr); err != nil { // Only original CDR stored in primary table, no derived
 			utils.Logger.Err(fmt.Sprintf("<CDRS> Storing primary CDR %+v, got error: %s", storedCdr, err.Error()))
+			return err // Error is propagated back and we don't continue processing the CDR if we cannot store it
 		}
 	}
 	go self.deriveRateStoreStatsReplicate(storedCdr)
diff --git a/engine/suretax_test.go b/engine/suretax_test.go
index 4482f4bf1..a01b203a3 100644
--- a/engine/suretax_test.go
+++ b/engine/suretax_test.go
@@ -52,6 +52,7 @@ func TestNewSureTaxRequest(t *testing.T) {
 		ResponseType:   "D4",
 		ItemList: []*STRequestItem{
 			&STRequestItem{
+				CustomerNumber:       "1001",
 				OrigNumber:           "1001",
 				TermNumber:           "1002",
 				BillToNumber:         "",