Don't update the server address if queued. Add error handling around controller api calls.