diff --git a/README.md b/README.md
index 459594dfa..34d8d09a4 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,8 @@
 <p align="center">
 <img src="https://github.com/crowdsecurity/crowdsec/workflows/Go/badge.svg">
 <img src="https://github.com/crowdsecurity/crowdsec/workflows/build-binary-package/badge.svg">
+<img src="https://goreportcard.com/badge/github.com/crowdsecurity/crowdsec">
+<img src="https://img.shields.io/github/license/crowdsecurity/crowdsec">
 </p>
 
 <p align="center">
diff --git a/pkg/sqlite/commit.go b/pkg/sqlite/commit.go
index dfdbd0e4a..4c51c6780 100644
--- a/pkg/sqlite/commit.go
+++ b/pkg/sqlite/commit.go
@@ -14,7 +14,9 @@ func (c *Context) Flush() error {
 	defer c.lock.Unlock()
 
 	ret := c.tx.Commit()
+
 	if ret.Error != nil {
+		c.tx = c.Db.Begin()
 		return fmt.Errorf("failed to commit records : %v", ret.Error)
 	}
 	c.tx = c.Db.Begin()
@@ -37,7 +39,7 @@ func (c *Context) AutoCommit() {
 			if atomic.LoadInt32(&c.count) != 0 &&
 				(atomic.LoadInt32(&c.count)%100 == 0 || time.Since(c.lastCommit) >= 500*time.Millisecond) {
 				if err := c.Flush(); err != nil {
-					log.Fatalf("failed to flush : %s", err)
+					log.Errorf("failed to flush : %s", err)
 				}
 			}
 		}