Added two ExceptionClasses
Reviewed by: Simon
Merge origin/master