Add null checks for spouse