OGM-370 Fix exceptions