Add safeguards