[FIXED JENKINS-9965] Fixed wrong return null