Removed Null Pointer