Clean some mistake
Try/catch exception management