Added an extra check