Fixed an initialization problem ... and added proactive non-null checks