fix null object pattern