diff --git a/client/src/main/scala/io/delta/sharing/client/DeltaSharingClient.scala b/client/src/main/scala/io/delta/sharing/client/DeltaSharingClient.scala
index 640e32309..21895822d 100644
--- a/client/src/main/scala/io/delta/sharing/client/DeltaSharingClient.scala
+++ b/client/src/main/scala/io/delta/sharing/client/DeltaSharingClient.scala
@@ -261,7 +261,7 @@ class DeltaSharingRestClient(
     if (response != null && response.items != null) {
       shares ++= response.items
     }
-    while (response.nextPageToken.nonEmpty) {
+    while (response.nextPageToken.exists(_.nonEmpty)) {
       val encodedPageToken = URLEncoder.encode(response.nextPageToken.get, "UTF-8")
       val target = getTargetUrl(s"/shares?pageToken=$encodedPageToken")
       response = getJson[ListSharesResponse](target)
@@ -280,7 +280,7 @@ class DeltaSharingRestClient(
     if (response != null && response.items != null) {
       tables ++= response.items
     }
-    while (response.nextPageToken.nonEmpty) {
+    while (response.nextPageToken.exists(_.nonEmpty)) {
       val encodedPageToken = URLEncoder.encode(response.nextPageToken.get, "UTF-8")
       val target =
         getTargetUrl(s"/shares/$encodedShareName/all-tables?pageToken=$encodedPageToken")