diff --git a/app/src/main/java/org/hydev/wearsync/Extensions.kt b/app/src/main/java/org/hydev/wearsync/Extensions.kt
index aa2e12b..1616ed6 100644
--- a/app/src/main/java/org/hydev/wearsync/Extensions.kt
+++ b/app/src/main/java/org/hydev/wearsync/Extensions.kt
@@ -152,7 +152,7 @@ object Database {
 
     class CursorIterator(val c: Cursor) : Iterator<Cursor>
     {
-        override fun hasNext() = !c.isAfterLast
+        override fun hasNext() = !c.isLast && !c.isAfterLast
         override fun next() = c.apply { moveToNext() }
     }