Fixed null customer bug