Fix error insertion in DB
Merge branch 'release/v2.0.4'