makeup minor changes
Uncaught exceptions handling