Fix bug 996. Error when cluster is not ready