Added a null check while scanning the journals directory
Merge remote-tracking branch 'origin/master'