Added inheritance saving and null checks to saver.