reverted null check