Update example, make util more safe.