Added an additional check.