Merge pull request #244 from JohnMai/anthonylim

Added null check in journal