Mihir handling null cases for diagnosis
Mihir | #BigStory | Added encounter persistence test