am 28a20d1a: am 98243310: Fix exception when creating a remote connection

* commit '28a20d1a6a883ba8445dbd036a67ebf951da50d7':
  Fix exception when creating a remote connection