added suport for error bubbling