[FIXED JENKINS-17357]

Be more defensive against what ADSI gives us