Attempt to correct a NPE due to a NULL socket.
Incremented to 2.2.3-SNAPSHOT