diff --git a/cql3/values.cc b/cql3/values.cc
index 1f4e5f7a89..e867616b89 100644
--- a/cql3/values.cc
+++ b/cql3/values.cc
@@ -60,7 +60,9 @@ raw_value_view raw_value_view::make_temporary(raw_value&& value) {
     switch (value._data.index()) {
     case 0:  return raw_value_view(managed_bytes(std::get<bytes>(value._data)));
     case 1:  return raw_value_view(std::move(std::get<managed_bytes>(value._data)));
-    default: return raw_value_view::make_null();
+    case 2:  return raw_value_view::make_null();
+    case 3: return raw_value_view::make_unset_value();
+    default: throw std::runtime_error(fmt::format("raw_value_view::make_temporary bad index: {}", value._data.index()));
     }
 }