fix error message display when item is not found
Merge branch 'working' into develop