Added null check in journal