-Add trivial null check (for easier unit testing)