Add better error handling on address updates