Added another safeguard.