Add more explicit exception messages