Adding "isNull" and "isUndefined" checks for Conditions