fixed check null