FEND-867 check for null