Most of these we already throwing exceptions, just in the wrong place.
One particularly crafty one wasn't.