Vishal, Nishi #645 null checks for Patient mapper