diff --git a/isetcam/optics/v_icam_opticsFlare.m b/isetcam/optics/v_icam_opticsFlare.m
index 8aa2141..b0b6faa 100644
--- a/isetcam/optics/v_icam_opticsFlare.m
+++ b/isetcam/optics/v_icam_opticsFlare.m
@@ -79,13 +79,16 @@
 
 %% The same scene through Zhenyi's piFlareApply
 
-% Close match.
-[oiApply, pMask, psf] = piFlareApply(scene,'num sides aperture',nsides, ...
-    'focal length',wvfGet(wvf,'focal length','m'), ...
-    'fnumber',wvfGet(wvf,'fnumber'));
-
-oiApply = oiSet(oiApply,'name','piFlare');
-oiWindow(oiApply);
-oiSet(oiApply,'gamma',0.5); drawnow;
+% piFlareApply is in ISETAuto and thus we do not always check this.
+if exist('piFlareApply','file')
+    % Close match.
+    [oiApply, pMask, psf] = piFlareApply(scene,'num sides aperture',nsides, ...
+        'focal length',wvfGet(wvf,'focal length','m'), ...
+        'fnumber',wvfGet(wvf,'fnumber'));
+
+    oiApply = oiSet(oiApply,'name','piFlare');
+    oiWindow(oiApply);
+    oiSet(oiApply,'gamma',0.5); drawnow;
+end
 
 %% END
diff --git a/isetcam/optics/v_icam_opticsWVF.m b/isetcam/optics/v_icam_opticsWVF.m
index 17b15ad..4070bb6 100644
--- a/isetcam/optics/v_icam_opticsWVF.m
+++ b/isetcam/optics/v_icam_opticsWVF.m
@@ -76,8 +76,10 @@
 identityLine;
 title('OTF: oi converted to wvf')
 
-% Checksum good to within 1 part in a thousand
-assert(real(sum(oiOTFS(:))) / 1.0831e+03 - 1 < 1e-3)
+% Checksum good to within 1 part in a thousand This changed slightly
+% (1.0831 to 1.085) with the Merge of ISETCam/ISETBio. Keeping an eye
+% on how this varies.
+assert(real(sum(oiOTFS(:))) / 1.085e+03 - 1 < 1e-3)
 
 %% Now, make a multispectral wvf and convert it to ISET OI format