Do not assume a connection event will always have a connection.
Merge branch 'null-connection-workaround'

* null-connection-workaround:
  Do not assume a connection event will always have a connection.