Coverity

Fix CIDs : 
-> 1 Logically dead code
-> 2 Dereference before null check