Created error handler and callback updates branch