Don't stacktrace if yard is already there
Merge pull request #13810 from UtahDave/develop

Don't stacktrace if yard is already there