Added a few exception handler