Merge pull request #86 from jstrimpel/master

handle link loading errors