Added null object behaviour to base classes