add error handler class and fix errors in progress