CORE-1612 - Add Support to throw appropriate status when content not found