Tried to improve error message as flagged in issue #431