Fixing a bug and a potential for other concurrency issues.
Merge pull request #1552 from abersnaze/most-recent-null

Fixing a bug and a potential for other concurrency issues.