Fix empty string error
Handle Java string comaparison properly
Handle Java string comaparison properly 2
Merge pull request #1299 from emilroz/CZI_empty_string_fix

Fix empty string error