I agree, unwrapping the option is indeed questionable. Yet these unwraps seemed good enough and I didn't want to touch the error handling itself, as it would entail more changes. Atm, we have no designated Error types to map to and imo just bail!-ing on a Result in this place adds no reasonable value. Consistently propagating errors from start to end would be more appropriate, I suppose.
For now, I just added some context as to what must have gone wrong in this very situation, because it changes just a tiny bit of code, while adding reasonable information. I could send a v2 that touches error handling in general, though.
