Removed unnecessary null guards