Repository exceptions fix.