This commit ensures that error messages contain more specific information regarding the reported error. Fixes: gh-6323