Revert "cursor was not checking cursor.getCount() > 0 before working with it,"
Merge pull request #712 from mozilla/revert-703-issue696

Revert "cursor was not checking cursor.getCount() > 0