Added exceptions to manage failure of item find
Merge remote-tracking branch 'origin/master'