diff --git a/connection.c b/connection.c
index 411e045..9833c39 100644
--- a/connection.c
+++ b/connection.c
@@ -2067,11 +2067,14 @@ inolog("Discarded a RELEASE result\n");
 					}
 					if (!CC_from_PGresult(res, stmt, self, cursor, &pgres))
 					{
+						aborted = TRUE;
 						if (QR_command_maybe_successful(res))
 							retres = NULL;
 						else
+						{
 							retres = cmdres;
-						aborted = TRUE;
+							goto cleanup;
+						}
 					}
 					query_completed = TRUE;
 				}