More careful null checking and member initalization.