I did this to fail-tolerant rather than fail-crash, but I'll commit to except in a second