FIXED JENKINS-21069
Fixed JENKINS-21066
Fixed JENKINS-21068, implemented better error message