Merge branch 'ecarm002/exceptions'