Merge "Handle invalid destination address gracefully"