Add loading safeguard