Catch UnknownHostException in ServerStatus
Merge branch 'master' into develop