[*]ELENA: changes in exception handling routines