Sonar Fix- NullPointer & removed unused variables