Merge: Better error handling in Socket