fixes mapping value with block. Replace null value to nil.