Handle 30x errors better