beefed up exception messages