See my comment above about making connectionId optional