Null Pointer fixed