diff --git a/cassandra/src/main/scala/filodb.cassandra/Util.scala b/cassandra/src/main/scala/filodb.cassandra/Util.scala
index af12e751e7..119d2b19f1 100644
--- a/cassandra/src/main/scala/filodb.cassandra/Util.scala
+++ b/cassandra/src/main/scala/filodb.cassandra/Util.scala
@@ -20,6 +20,7 @@ object Util {
         if (resultSet.wasApplied) Success else notAppliedResponse
       }.recover {
         case e: DriverException => throw StorageEngineException(e)
+        case e: Exception       => throw StorageEngineException(e)
       }
     }
   }
@@ -30,6 +31,7 @@ object Util {
       // from invalid Enum strings, which should never happen, or some other parsing error
       case e: NoSuchElementException   => throw MetadataException(e)
       case e: IllegalArgumentException => throw MetadataException(e)
+      case e: Exception                => throw StorageEngineException(e)
     }
   }
 
diff --git a/cassandra/src/main/scala/filodb.cassandra/columnstore/ChunkRowMapTable.scala b/cassandra/src/main/scala/filodb.cassandra/columnstore/ChunkRowMapTable.scala
index 2a8df089a8..a67fe236b7 100644
--- a/cassandra/src/main/scala/filodb.cassandra/columnstore/ChunkRowMapTable.scala
+++ b/cassandra/src/main/scala/filodb.cassandra/columnstore/ChunkRowMapTable.scala
@@ -70,7 +70,7 @@ sealed class ChunkRowMapTable(dataset: DatasetRef, connector: FiloCassandraConne
                    version: Int): Future[Iterator[ChunkRowMapRecord]] =
     session.executeAsync(allPartReadCql.bind(toBuffer(binPartition),
                                              version: java.lang.Integer))
-           .toIterator.map(_.map(fromRow))
+           .toIterator.map(_.map(fromRow)).handleErrors
 
   /**
    * Retrieves a whole series of chunk maps, in the range [startSegmentId, untilSegmentId)
@@ -83,7 +83,7 @@ sealed class ChunkRowMapTable(dataset: DatasetRef, connector: FiloCassandraConne
     session.executeAsync(cql.bind(toBuffer(keyRange.partition),
                                   version: java.lang.Integer,
                                   toBuffer(keyRange.start), toBuffer(keyRange.end)))
-           .toIterator.map(_.map(fromRow))
+           .toIterator.map(_.map(fromRow)).handleErrors
   }
 
   val tokenQ = "TOKEN(partition, version)"
@@ -99,7 +99,7 @@ sealed class ChunkRowMapTable(dataset: DatasetRef, connector: FiloCassandraConne
                .filter(_.getInt("version") == version)
                .map { row => fromRow(row) }
       }
-    }
+    }.handleErrors
   }
 
   /**