should handle NotFound explicitly.