Some error handler code clean-up