Added ExceptionHandler and project cleanup