Adds missing exceptions for highlighting.
Merge pull request #24 from gradha/pr_adds_missing_exceptions

Adds missing exceptions for highlighting.