Try to improve error messages in response to issue #479