NUll Pointer fix