Fixed null object property