Housekeeping
Error message refinement
Database rollback