Merge commit 'bd2c930e1ae624b711c447fa5c76cc550ed243c1' * commit 'bd2c930e1ae624b711c447fa5c76cc550ed243c1': Don't crash if the cursor is null.
Merge commit 'bd2c930e1ae624b711c447fa5c76cc550ed243c1' * commit 'bd2c930e1ae624b711c447fa5c76cc550ed243c1': Don't crash if the cursor is null.