Merge "Handle unexpected null cursor and don't forget to close it."