Added cluster deletion during failure

During cluster state "Error" cluster deletes.

Change-Id: Idaad2f21040b062cf98687be23b8c22ebb6475a3