renamed an exception and changed a link in a comment
Merge remote-tracking branch 'origin/master'