Merge change 6960

* changes:
  Don't NPE if a restore session is requested for an invalid transport