Merge change 25503 into eclair

* changes:
  Don't crash if the cursor is null.