Refactored the empty string check code to be less complication (using is...

...EqualToString method).