Factor error making into collaborator ErrorFactory