diff --git a/network/src/main/java/org/openjdk/skara/network/RestRequest.java b/network/src/main/java/org/openjdk/skara/network/RestRequest.java
index 90382b180..6587bd16b 100644
--- a/network/src/main/java/org/openjdk/skara/network/RestRequest.java
+++ b/network/src/main/java/org/openjdk/skara/network/RestRequest.java
@@ -432,7 +432,7 @@ private JSONValue execute(QueryBuilder queryBuilder) throws IOException {
 
             link = response.headers().firstValue("Link");
             links = parseLink(link.orElseThrow(
-                    () -> new RuntimeException("Initial paginated response no longer paginated")));
+                    () -> new UncheckedRestException("Initial paginated response no longer paginated for query: " + queryBuilder)));
 
             parsedResponse = parseResponse(response);
             ret.add(parsedResponse);