Merge "Enhance error messages Marketplace UI"