am 98243310: Fix exception when creating a remote connection

* commit '982433108ea2dc179610fa415d538aa989e68529':
  Fix exception when creating a remote connection