Improved error handling in Socket.cpp
Merge with changes locally with updates from Joris. Testing yet to be done.
Merge branch 'master' of github.com:djgroen/MPWide

Conflicts:
	Socket.cpp