* exception handling fix