error handling + clusterQueue updated