add Exception control flow
fix conflict