Improved consistency around socket existence.
0.6.3