Issue #296: Adds failsafes