Fixes on Exception Handling