Exception update
Merge pull request #147 from rbrueckner93/Nils

Exception update