Fixed overridden accessor methods to be nil safe.