diff --git a/lib/build.gradle b/lib/build.gradle
index 075821e..9142bf1 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -15,7 +15,7 @@ plugins {
     id("maven-publish")
 }
 
-version = '0.2.0'
+version = '0.2.1'
 
 java {
     toolchain {
diff --git a/lib/src/main/java/org/epics/archiverappliance/retrieval/client/RawDataRetrieval.java b/lib/src/main/java/org/epics/archiverappliance/retrieval/client/RawDataRetrieval.java
index 5a87177..6521f95 100644
--- a/lib/src/main/java/org/epics/archiverappliance/retrieval/client/RawDataRetrieval.java
+++ b/lib/src/main/java/org/epics/archiverappliance/retrieval/client/RawDataRetrieval.java
@@ -60,7 +60,7 @@ public final GenMsgIterator getDataForPVs(
         } else {
             buf.append("?pv=").append(first_encoded);
         }
-        for (var pvName : pvNames) {
+        for (var pvName : pvNames.subList(1, pvNames.size())) {
             buf.append("&pv=").append(URLEncoder.encode(pvName, StandardCharsets.UTF_8));
         }
         buf.append("&from=").append(convertToUTC(startTime)).append("&to=").append(convertToUTC(endTime));
@@ -87,10 +87,6 @@ public final GenMsgIterator getDataForPVs(
                 return null;
             }
             InputStream is = response.body();
-            if (is.available() <= 0) {
-                logger.warning("Empty response from server when fetching data from " + getURL);
-                return null;
-            }
             return new InputStreamBackedGenMsg(is);
 
         } catch (Exception ex) {