Improved errorHandler message
Lots of cleanups