Refactor existing code

Prefer exception over boolean `ready' flag."