add the null check
get cycle around by the logic