WL-2365 improved error messages