diff --git a/db/sqldb/task_db.go b/db/sqldb/task_db.go
index 2ad40edc..5f5ab54f 100644
--- a/db/sqldb/task_db.go
+++ b/db/sqldb/task_db.go
@@ -458,13 +458,18 @@ func (db *SQLDB) fetchTasks(ctx context.Context, logger lager.Logger, rows *sql.
 		var guid string
 
 		task, guid, err = db.fetchTaskInternal(logger, rows)
-		if err == models.ErrDeserialize {
-			invalidGuids = append(invalidGuids, guid)
+		if err != nil {
+			if err == models.ErrDeserialize {
+				invalidGuids = append(invalidGuids, guid)
+			}
+
 			if abortOnError {
 				break
 			}
+
 			continue
 		}
+
 		tasks = append(tasks, task)
 		validGuids = append(validGuids, task.TaskGuid)
 	}