improved error reporting
Merge branch 'hotfix/3.5.3-3'