Fixes: #3196
I can't reproduce it, so I'm not completely sure this works.
rebased onto 83bfcffee26737ad84df9afa40b33ed89fe5f04e
rebased onto 4c386fbc3ff6ed9437cfc18d9023f0d6c73575c7
I see the traceback and I think the fix is right so I'm going to merge this but grr it's annoying not to be able to replicate this :(
Pull-Request has been merged by pingou
Fixes: #3196
I can't reproduce it, so I'm not completely sure this works.