Minor exception improvement for the AddressPicker