@@ -66,7 +66,9 @@ public ApiFuture<Void> closeAsync() {
 if (txnState == TransactionState.STARTED) {
 res = rollbackAsync();
 }
-txn.close();
+if (txn != null) {
+txn.close();
+}
 return MoreObjects.firstNonNull(res, ApiFutures.<Void>immediateFuture(null));
 }
 
@@ -172,7 +174,7 @@ public ApiFuture<Void> apply(Empty input) throws Exception {
 
 @Override
 public TransactionContextFuture resetForRetryAsync() {
-if (txn == null || !txn.isAborted() && txnState != TransactionState.ABORTED) {
+if (txn == null || (!txn.isAborted() && txnState != TransactionState.ABORTED)) {
 throw new IllegalStateException(
 "resetForRetry can only be called if the previous attempt aborted");
 }
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,9 @@ public ApiFuture<Void> closeAsync() {`
`66`	`66`	`if (txnState == TransactionState.STARTED) {`
`67`	`67`	`res = rollbackAsync();`
`68`	`68`	`}`
`69`		`-txn.close();`
	`69`	`+if (txn != null) {`
	`70`	`+txn.close();`
	`71`	`+}`
`70`	`72`	`return MoreObjects.firstNonNull(res, ApiFutures.<Void>immediateFuture(null));`
`71`	`73`	`}`
`72`	`74`
`@@ -172,7 +174,7 @@ public ApiFuture<Void> apply(Empty input) throws Exception {`
`172`	`174`
`173`	`175`	`@Override`
`174`	`176`	`public TransactionContextFuture resetForRetryAsync() {`
`175`		`-if (txn == null \|\| !txn.isAborted() && txnState != TransactionState.ABORTED) {`
	`177`	`+if (txn == null \|\| (!txn.isAborted() && txnState != TransactionState.ABORTED)) {`
`176`	`178`	`throw new IllegalStateException(`
`177`	`179`	`"resetForRetry can only be called if the previous attempt aborted");`
`178`	`180`	`}`