Worked on the eclipse-jdt/eclipse.jdt.core repository to enhance the stability and reliability of Java search functionality. Addressed a NullPointerException in the SourceType.getPrimaryElement method by introducing a null check for the CompilationUnit, directly improving error handling and preventing potential runtime failures. Reinforced the solution with targeted unit tests that verify method declaration search, ensuring future changes do not introduce regressions. Utilized Java and software development best practices, with a focus on robust unit testing to maintain code quality. The work enabled safer refactoring and improved downstream tooling by making the Java search component more resilient and maintainable within the codebase.