Remove the null check?