Fixed null contact error