Fix embarrassing bug in crash recovery.

(And yes, we always knew we need tests for that. I have added a TODO now.)

@juliusv 
Should this still be "beorn" now? Or "bjoern"?