Fix CID 1186644: ES: Checking String equality using == or !=
Findbugs: Fix potential NPE