Return error if we fail to delete hive resources during deletion (#3179)

Return error if we fail to delete hive resources during deletion (#3179) #6620