DS-1993, return null instead of throwing exception
Merge pull request #531 from vidiecan/DS-1993

DS-1993, return null instead of throwing exception