Issue #291: Adds extra failsafe