diff --git a/src/java/org/apache/cassandra/avro/CassandraServer.java b/src/java/org/apache/cassandra/avro/CassandraServer.java
index 71ada9b197..a18bccc349 100644
--- a/src/java/org/apache/cassandra/avro/CassandraServer.java
+++ b/src/java/org/apache/cassandra/avro/CassandraServer.java
@@ -37,6 +37,7 @@ import org.apache.avro.generic.GenericArray;
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.ipc.AvroRemoteException;
 import org.apache.avro.util.Utf8;
+import org.apache.cassandra.thrift.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -163,6 +164,10 @@ public class CassandraServer implements Cassandra {
         {
             throw new UnavailableException();
         }
+        catch (org.apache.cassandra.thrift.InvalidRequestException e)
+        {
+            throw new InvalidRequestException();
+        }
         finally
         {
             release();