Added an additional check for 'empty' baseline