Fixed issue #09307: Calling a survey with a non-existing token leads to PHP Warning (debug=1)
Dev: $oToken can be null
Dev: Fix some merging error (b5142e78a2d006a8b73b38347af4229b6a9027f6 child)