Merge "Fix NPE & other sonar issues"