Add another safeguard