Removing the null check