Fix for not helpful exception messages