[[ Bug 11953 ]] The previous fix was incorrect - and only masking the real error