Merge "Added check for mText property in getText()"