[FEATURE] Improved db rollback on error