Make the lazy loading work even if the persistence layer fails.
Merge pull request #279 from bstell/master

Make the lazy loading work even if the persistence layer fails.