Most errors are handled correctly now
Do some cleanup of error handlers