Merge "Fix crashes when inserting."