Add a fail-safe mechanism