LPS-51912 manage exceptions in the same way for all repositories