fixup! Handle fallout in os