Improved error management, rollback behaviour