Fix default behaviour of contact_for_addr and handle unexpected ContactError in places.