Remove the unnecessary null checking