Moved exception handling to base repository