Fix fundbugs issues (Exception Handler)