[#3322] Last minute change I missed sanity checking causes a crash.