Added error bubbling within error handler
Added error bubbling within error handler