Merge "fix NPE SO Response"