forgot to add the new errors
Merge branch 'dev' into vogel
fixing import of new error classes