add support for exceptions being thrown down the line