Handle the case when we are retrieving the object after persistence.
Merge branch 'lowjoel-fix-superclass-save'