[FIXED JENKINS-21261]

Don't let null returned in the collection which will confuse core.