add stub error handler, get rid of temp error handlers