Merge pull request #482 from bt/master

Added ShouldBeError assertion