Yeah I was expecting I need to modify this when rebasing on your changes. 

I like that approach. Prefer return over exit :)

I'll modify this bit during rebase.