commit - 1d2b5e870e270a778f599e239e6bf8b091d97bb4
commit + 9fae180de0b682e0d81ac5a1a47685fc68574d6c
blob - dc083bc858e0c9c77103cab6f819d1185a4e9656
blob + 71e546eb41db12feae3cb71dbab66594d4b63fca
--- lib/pack_create_privsep.c
+++ lib/pack_create_privsep.c
@@ -445,17 +445,15 @@ got_pack_paint_commits(int *ncolored, struct got_objec
 				    ids, keep, drop, skip, repo,
 				    progress_cb, progress_arg, rl,
 				    cancel_cb, cancel_arg);
-				if (err && qid == NULL)
-					goto done;
 				if (qid) {
 					STAILQ_REMOVE(ids, qid,
 					    got_object_qid, entry);
 					nqueued--;
 					got_object_qid_free(qid);
 					qid = NULL;
-					if (err)
-						goto done;
-				}
+				}
+				if (err)
+					goto done;
 				continue;
 			}
 		}