diff --git a/source/java/org/alfresco/filesys/avm/AVMDiskDriver.java b/source/java/org/alfresco/filesys/avm/AVMDiskDriver.java
index 081d45e800..d3ead15b5c 100644
--- a/source/java/org/alfresco/filesys/avm/AVMDiskDriver.java
+++ b/source/java/org/alfresco/filesys/avm/AVMDiskDriver.java
@@ -55,6 +55,7 @@ import org.alfresco.repo.avm.CreateVersionTxnListener;
 import org.alfresco.repo.avm.PurgeStoreTxnListener;
 import org.alfresco.repo.avm.PurgeVersionTxnListener;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.service.cmr.avm.AVMBadArgumentException;
 import org.alfresco.service.cmr.avm.AVMExistsException;
 import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.cmr.avm.AVMNotFoundException;
@@ -667,6 +668,10 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface {
     	{
     		throw new FileNotFoundException( params.getPath());
     	}
+    	catch ( AVMBadArgumentException ex)
+    	{
+    		throw new FileNotFoundException( params.getPath());
+    	}
     }
     
     /**
@@ -753,6 +758,10 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface {
     	{
     		throw new FileNotFoundException( params.getPath());
     	}
+    	catch ( AVMBadArgumentException ex)
+    	{
+    		throw new FileNotFoundException( params.getPath());
+    	}
     	
     	// Return the file