Fixed problem in merge.
Merge pull request #111 from scrollback/storage-null-time-bug

Fixed problem in merge.