MapConverter should also handle null keys