Fixing an exception rethrowing.