Better handle badly behaving remote repos