Add two new types of exceptions (issue #152)