Merge exceptions (close #113; part of #104)