Fix Null Reference Exception.  Some other changes.