Null pointers removed