Patch Set 1: I would prefer that you didn't submit this; No score

Codewise this looks fine, but please separate the different kinds of changes into separate commits

E.g these three:

Fix exception handlinbg anti-pattern
Move utlity methods closer to their use
Remove obsolete TODO:d