Add a safety clause to prevent error runs