Fixes #79.
Merge pull request #80 from frmwrk123/enhancement/IllegalLinkException

Fixes #79.