Fixes NB#108253, fixes a G_CRITICAL