Merge commit '34cc52922d4268633b3730dfd73658be6a06a2c5' * commit '34cc52922d4268633b3730dfd73658be6a06a2c5': Check cursor and URI value for nullity to prevent NPE.
Merge commit '34cc52922d4268633b3730dfd73658be6a06a2c5' * commit '34cc52922d4268633b3730dfd73658be6a06a2c5': Check cursor and URI value for nullity to prevent NPE.