Resurrect old checkIfServerIsOk method and enhnce [1656]