Merge "Fix crash when error messages are triggered due to configuration changes." into sc-v2-dev