GEB-357 Be more explicit about which exception to expect