Better defined handling of contradictions during client-side checking

[jamesdabbs]

We currently pre-check the bundle for contradictions before saving it, so this should be impossible. But we probably should have well-defined error handling here in any case.