Worked on enhancing the reliability of Spring integration within the AxonFramework repository by addressing a bug in the Spring Component Retrieval flow. Focused on aligning the getOptionalComponent method with getComponent to ensure consistent exception handling and component retrieval logic. Utilized Java and the Spring Framework to refactor the relevant code paths, improving startup reliability and runtime stability for Spring-based deployments. Added comprehensive unit tests to cover multi-bean and no-bean scenarios, which helps prevent regressions and reduces the risk of runtime errors. This work strengthened maintainability and laid a foundation for safer future enhancements in the integration layer.