Fix for issue U4-5364 without trying to fix the localization of the error text.
Merge pull request #581 from readingdancer/Fix_for_5364_Second_Version

Fix for issue U4-5364 without trying to fix the localization of error msg.