Also added a fix in a check for empty string. Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> (cherry picked from commit 1a9a7cc280)
1a9a7cc280