Merge pull request #1526 from arrbee/cleanup-error-return-without-msg Make sure error messages are set for most error returns