* Apply patch from Ethan to improve an error message that should never