Token commit, change stupid exception based stuff

What was I thinking? I guess I didn't remember that the 'in' keyword
existed at this point.

Acked-by: Matthew Darby <me@mjdarby.net>