Whitespace.
Whitespace.
Added some really basic error reporting when handlers go tit's up.