Changed error detection a bit so that the interface still gets visible and allow changing to another server.
Merge pull request #42 from ptdev/master

Better error detection