AIMS-50 Catch the case where an item is not found.
Merge branch 'tray-stocking' into staging