Fix assignment to nil map

cbugg: close bug-616