Fixed empty string crash