re #8924 improved error handling