Add safeguard against the safeguard not being present.