Hopefully fix bug with some malformed maps that can make the client crash