Inconsistent State Failsafes

Closes #354