Return error if we fail to delete hive resources during deletion

Return error if we fail to delete hive resources during deletion #4089