add (null == 0) and (null == 1)