add protection around non-link value
lint cleanup