diff --git a/source/java/org/alfresco/repo/avm/AVMRemoteImpl.java b/source/java/org/alfresco/repo/avm/AVMRemoteImpl.java
index 7de0a0243b..e6bf2fc4bc 100644
--- a/source/java/org/alfresco/repo/avm/AVMRemoteImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMRemoteImpl.java
@@ -20,7 +20,6 @@ package org.alfresco.repo.avm;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -148,6 +147,7 @@ public class AVMRemoteImpl implements AVMRemote, Runnable
             {
                 // Do nothing.
             }
+            /*
             long now = System.currentTimeMillis();
             List<String> toClose = new ArrayList<String>();
             for (String handle : fInputLastAccessTimes.keySet())
@@ -201,6 +201,7 @@ public class AVMRemoteImpl implements AVMRemote, Runnable
                 fOutputLastAccessTimes.remove(handle);
                 fOutputBusy.remove(handle);
             }
+            */
         }
     }
     
@@ -268,7 +269,7 @@ public class AVMRemoteImpl implements AVMRemote, Runnable
         try
         {
             int read;
-            while ((read = in.read(buff, off, count - off)) != -1)
+            while ((read = in.read(buff, off, count - off)) != -1 && read != 0)
             {
                 off += read;
             }
diff --git a/source/java/org/alfresco/repo/avm/AVMTestRemote.java b/source/java/org/alfresco/repo/avm/AVMTestRemote.java
index d029f059f2..47f1c1562d 100644
--- a/source/java/org/alfresco/repo/avm/AVMTestRemote.java
+++ b/source/java/org/alfresco/repo/avm/AVMTestRemote.java
@@ -103,4 +103,28 @@ public class AVMTestRemote extends TestCase
             fail();
         }
     }
+
+    /**
+     * Test a call that should throw an exception.
+     */
+    public void testErrorState()
+    {
+        try
+        {
+            try
+            {
+                fAVMRemote.lookup(-1, "main:/fizz/fazz");
+                fail();
+            }
+            catch (AVMException e)
+            {
+                e.printStackTrace(System.out);
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace(System.err);
+            fail();
+        }
+    }
 }