Fix NullPointerException with /spouse