If i remove the two lines as you suggested bellow isn't this case treated by the ChallengeException thrown on line 26?