updated error messages for improved rollback feature