Merge "Handle the case of a null cursor being returned."