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

* commit 'a005cb2d1568d61369e491915fce5811a607dc31':
  Fix exception when creating a remote connection