[DF-5091] Little fixes after review
[DF-5091] Return NULL in stead of exception.