Some more fixes to error handling.

Don't wrap HandlerExceptions in HandlerExceptions.