diff --git a/dev/src/pool.ts b/dev/src/pool.ts
index 3d417d8db..6d0e2b36a 100644
--- a/dev/src/pool.ts
+++ b/dev/src/pool.ts
@@ -184,7 +184,7 @@ export class ClientPool<T> {
    */
   run<V>(requestTag: string, op: (client: T) => Promise<V>): Promise<V> {
     if (this.terminated) {
-      throw new Error('The client has already been terminated');
+      return Promise.reject('The client has already been terminated');
     }
     const client = this.acquire(requestTag);
 
diff --git a/dev/system-test/firestore.ts b/dev/system-test/firestore.ts
index 9d2fe9d2d..7491e4891 100644
--- a/dev/system-test/firestore.ts
+++ b/dev/system-test/firestore.ts
@@ -130,19 +130,14 @@ describe('Firestore class', () => {
 
   it('cannot make calls after the client has been terminated', () => {
     const ref1 = randomCol.doc('doc1');
-    ref1.onSnapshot(snapshot => {
-      return Promise.reject('onSnapshot() should be called');
-    });
     return firestore
       .terminate()
       .then(() => {
         return ref1.set({foo: 100});
       })
-      .then(() => {
-        Promise.reject('set() should have failed');
-      })
+      .then(() => Promise.reject('set() should have failed'))
       .catch(err => {
-        expect(err.message).to.equal('The client has already been terminated');
+        expect(err).to.equal('The client has already been terminated');
       });
   });
 });