Some cleanups for Cluster
Error handling for EC2 cluster