1166036 Date: add isset checking