Warning fixes + kill the exception.

Yeah, THAT exception that had been nagging me since, well, forever ;-).