Adding some features for detecting null objects, and better naming.