diff --git a/lib/utils/neynar-client.js b/lib/utils/neynar-client.js
index ee97a3919..99a47ef4f 100644
--- a/lib/utils/neynar-client.js
+++ b/lib/utils/neynar-client.js
@@ -1,83 +1,94 @@
 // @flow
 
 import invariant from 'invariant';
 
+import { getMessageForException } from './errors.js';
+
 type FarcasterUser = {
   +fid: number,
   +viewerContext: {
     +following: boolean,
   },
   ...
 };
 
 type FetchFollowersResponse = {
   +result: {
     +users: $ReadOnlyArray<FarcasterUser>,
     +next: {
-      +cursor: string,
+      +cursor: ?string,
     },
   },
 };
 
 const neynarBaseURL = 'https://api.neynar.com/';
 const neynarURLs = {
   '1': `${neynarBaseURL}v1/farcaster/`,
 };
 function getNeynarURL(
   apiVersion: string,
   apiCall: string,
   params: { [string]: string },
 ): string {
   const neynarURL = neynarURLs[apiVersion];
   invariant(
     neynarURL,
     `could not find Neynar URL for apiVersion ${apiVersion}`,
   );
   return `${neynarURL}${apiCall}?${new URLSearchParams(params).toString()}`;
 }
 
 const fetchFollowerLimit = 150;
 
 class NeynarClient {
   apiKey: string;
 
   constructor(apiKey: string) {
     this.apiKey = apiKey;
   }
 
   // We're using the term "friend" for a bidirectional follow
   async fetchFriendFIDs(fid: string): Promise<string[]> {
     const fids = [];
-    const params: { [string]: string } = {
-      fid,
-      viewerFid: fid,
-      limit: fetchFollowerLimit.toString(),
-    };
-    while (true) {
+    let paginationCursor = null;
+
+    do {
+      const params: { [string]: string } = {
+        fid,
+        viewerFid: fid,
+        limit: fetchFollowerLimit.toString(),
+        ...(paginationCursor ? { cursor: paginationCursor } : null),
+      };
+
       const url = getNeynarURL('1', 'followers', params);
-      const response = await fetch(url, {
-        method: 'GET',
-        headers: {
-          Accept: 'application/json',
-          api_key: this.apiKey,
-        },
-      });
-      const json: FetchFollowersResponse = await response.json();
-      const { users } = json.result;
-      for (const user of users) {
-        if (!user.viewerContext.following) {
-          continue;
+
+      try {
+        const response = await fetch(url, {
+          method: 'GET',
+          headers: {
+            Accept: 'application/json',
+            api_key: this.apiKey,
+          },
+        });
+
+        const json: FetchFollowersResponse = await response.json();
+        const { users } = json.result;
+
+        for (const user of users) {
+          if (user.viewerContext.following) {
+            fids.push(user.fid.toString());
+          }
         }
-        fids.push(user.fid.toString());
-      }
-      if (users.length < fetchFollowerLimit) {
-        return fids;
+
+        paginationCursor = json.result.next.cursor;
+      } catch (error) {
+        console.log('Failed to fetch friend FIDs:', error);
+        throw new Error(getMessageForException(error) ?? 'unknown');
       }
-      params.cursor = json.result.next.cursor;
-    }
-    // eslint-disable-next-line no-unreachable
-    throw new Error('should not get here');
+    } while (paginationCursor);
+
+    return fids;
   }
 }
 
 export { NeynarClient };