minor corrections - use guava Strings class for null/empty check, fix typo