diff --git a/velox/docs/functions/spark/map.rst b/velox/docs/functions/spark/map.rst
index 243e0f9acc6d..ed53c3bfdc91 100644
--- a/velox/docs/functions/spark/map.rst
+++ b/velox/docs/functions/spark/map.rst
@@ -29,7 +29,7 @@ Map Functions
 
 .. spark:function:: map_from_entries(array(struct(K,V))) -> map(K,V)
 
-    Returns a map created from the given array of entries. Keys are not allowed to be null or to contain nulls.
+    Returns a map created from the given array of entries. Exceptions will be thrown if key is null or contains null.
     If null entry exists in the array, return null for this whole array.::
 
         SELECT map_from_entries(array(struct(1, 'a'), struct(2, 'null'))); -- {1 -> 'a', 2 -> 'null'}
diff --git a/velox/functions/lib/MapFromEntries.cpp b/velox/functions/lib/MapFromEntries.cpp
index 29e06eab942f..dee4390fe83e 100644
--- a/velox/functions/lib/MapFromEntries.cpp
+++ b/velox/functions/lib/MapFromEntries.cpp
@@ -132,7 +132,7 @@ class MapFromEntriesFunction : public exec::VectorFunction {
     });
 
     auto resetSize = [&](vector_size_t row) { mutableSizes[row] = 0; };
-    auto nulls = allocateNulls(rows.size(), context.pool());
+    auto nulls = allocateNulls(rows.end(), context.pool());
     auto* mutableNulls = nulls->asMutable<uint64_t>();
 
     if (decodedRowVector->mayHaveNulls() || keyVector->mayHaveNulls() ||
diff --git a/velox/functions/sparksql/tests/MapFromEntriesTest.cpp b/velox/functions/sparksql/tests/MapFromEntriesTest.cpp
index 578a1a06bb2b..9c8226f8e902 100644
--- a/velox/functions/sparksql/tests/MapFromEntriesTest.cpp
+++ b/velox/functions/sparksql/tests/MapFromEntriesTest.cpp
@@ -14,12 +14,9 @@
  * limitations under the License.
  */
 #include <cstdint>
-#include <optional>
 #include "velox/common/base/tests/GTestUtils.h"
-#include "velox/functions/lib/CheckDuplicateKeys.h"
 #include "velox/functions/prestosql/ArrayConstructor.h"
 #include "velox/functions/sparksql/tests/SparkFunctionBaseTest.h"
-#include "velox/vector/tests/TestingDictionaryArrayElementsFunction.h"
 
 using namespace facebook::velox::test;