More cleaning
fixed nullpointer in adding ownperson to contacts