added null checks for accessing Dataholder object