Do not assume a connection event will always have a connection.
Merge pull request #636 from warpr/null-connection-workaround

Do not assume a connection event will always have a connection.