Added another unit test.  Added better exception handling in case of server connection fail
Merge remote-tracking branch 'origin/master'