Sonar

Sonar Review #2156 - Correctness - Call to equals() with null argument