OGM-262 added error menagement