And fix those newly added isNull() calls!