Merge pull request #2190 from Numpsy/AddADNotFoundException