DS-1993, return null instead of throwing exception