Add a safe guard