Added the null condition