Merge "Fix the import of NotFound exception"