I've been holding off working around this crash in the hope that I'd be
able to reproduce it and track down the real problem. I didn't manage to,
and if we're releasing soonish it's probably best to try and avoid crashing.