Null Pointer fix