add NaN check for evt shape variables