refs #13650, #13006, CRM user framework update, error handling correct