Properly handle decoding of maps with nil entries (#3490)

Properly handle decoding of maps with nil entries (#3490) #728