Removed some useless null-check.