Move rollback check out of recordEntityMessagesForEntity and into callers