Merge "callforwarding: Add checking response NPE"