Adapted tests for exception catching instead of expecting nulls