Merge "Improved cryptic error message" into release-4-5-patches