Added a safeguard.