Change from AssertionError to FailException