ome exception fixes. #385