improved null checking by ObjectUtils class