Added empty string check