why is this error detection removed? seperate patch please, it is difficult to review otherwise