Avoid adding to nil surname

Should not be one but there is