diff --git a/src/afs/afs_bypasscache.c b/src/afs/afs_bypasscache.c
index 2e92b413d1..a6e1c18b51 100644
--- a/src/afs/afs_bypasscache.c
+++ b/src/afs/afs_bypasscache.c
@@ -285,18 +285,18 @@ done:
 	ciov = auio->uio_iov; \
 	iovmax = auio->uio_iovcnt - 1;	\
 	pp = (struct page*) ciov->iov_base;	\
-	afs_warn("BYPASS: Unlocking pages...");	\
 	while(1) { \
-	    if(pp != NULL && PageLocked(pp)) \
-		UnlockPage(pp);	\
-            put_page(pp); /* decrement refcount */ \
+	    if (pp) { \
+		if (PageLocked(pp)) \
+		    UnlockPage(pp);	\
+		put_page(pp); /* decrement refcount */ \
+	    } \
 	    iovno++; \
 	    if(iovno > iovmax) \
 		break; \
 	    ciov = (auio->uio_iov + iovno);	\
 	    pp = (struct page*) ciov->iov_base;	\
 	} \
-	afs_warn("Pages Unlocked.\n"); \
     } while(0)
 #else
 #ifdef UKERNEL
@@ -355,6 +355,13 @@ afs_NoCacheFetchProc(struct rx_call *acall,
 	    goto done;
 	}
 
+	/* If we get a 0 length reply, time to cleanup and return */
+	if (length == 0) {
+	    unlock_and_release_pages(auio);
+	    result = 0;
+	    goto done;
+	}
+
 	/*
 	 * The fetch protocol is extended for the AFS/DFS translator
 	 * to allow multiple blocks of data, each with its own length,