Considered empty clusters, added check for error