CMS-3633 TypeScript - Improve error handling in Admin Console