Added Null entrys to if statements