Move psf check before data check