add protection around non-link value
lint cleanup
Merge pull request #219 from dajohnso/minor_tweaks

Minor tweaks