Removed useless null check