diff --git a/crates/vm/src/builtins/map.rs b/crates/vm/src/builtins/map.rs
index 4dda9caf211..cb8db23e640 100644
--- a/crates/vm/src/builtins/map.rs
+++ b/crates/vm/src/builtins/map.rs
@@ -37,9 +37,12 @@ impl Constructor for PyMap {
     fn py_new(
         _cls: &Py<PyType>,
         (mapper, iterators, args): Self::Args,
-        _vm: &VirtualMachine,
+        vm: &VirtualMachine,
     ) -> PyResult<Self> {
         let iterators = iterators.into_vec();
+        if iterators.is_empty() {
+            return Err(vm.new_type_error("map() must have at least two arguments."));
+        }
         let strict = Radium::new(args.strict.unwrap_or(false));
         Ok(Self {
             mapper,
diff --git a/extra_tests/snippets/builtin_map.py b/extra_tests/snippets/builtin_map.py
index 559d108e38b..e6e71a8124b 100644
--- a/extra_tests/snippets/builtin_map.py
+++ b/extra_tests/snippets/builtin_map.py
@@ -24,6 +24,13 @@ def __iter__(self):
 assert next(it) == 2
 assert next(it) == 3
 
+# test for no iterables
+try:
+    map(lambda: 1)
+    assert False, "TypeError expected at map construction"
+except TypeError as e:
+    assert str(e) == "map() must have at least two arguments."
+
 
 def mapping(x):
     if x == 0: