Added extra guards for exceptions and the benchmark to the make test