Added another fail-safe.