Also include extra information about socket errors within the exceptions.

Change-Id: I9464a484460d40be5727e18ca6f057df9076766e