Merge "Fix crash in dump function."