Added error handler
Updated build