#241 Improved error messages

@twoldrich please test and merge