Made the sad path blow up instead of do nothing.

Also refactored a teensy bit.