Added error checking when connecting to server
Merge remote-tracking branch 'origin/master'