fixed error bubbling take 2
more fixes to error bubbling