Adding not found support to entity retrieval service