Refactor safe savepoint :)