Merge "DO NOT MERGE Fix of crash when error messages are triggered"