Ensure correct propagation of repository exceptions