Added error handler capability