Get rid of another String.isEmpty()
Upped Version: 3.7.2