Rejigger error message, fixes #39