Fix item not found exception