Handle address not found better