Merge pull request #831 from gbirchmeier/nullable-log-and-store

Merge pull request #831 from gbirchmeier/nullable-log-and-store #52