Removed minor things found by FindBugs EPD-63
Comparison between possible null fixed
Comparison between possible null fixed