Minor cleanup, slight performance improvement by eliminating unnecessary null check