Added support for offline/invalid servers

resolves #4