add support for exceptions being thrown down the line
Merge pull request #3 from phillip-haydon/Tests

add support for exceptions being thrown down the line