Merge change I73b00501 into eclair-mr2

* changes:
  Check cursor and URI value for nullity to prevent NPE.