Issue #82 - Add check for Item