Added an extra check.