Altered null check