added check null