diff --git a/datastore/google/cloud/datastore/helpers.py b/datastore/google/cloud/datastore/helpers.py
index f3838668fe3d..964eb2a37204 100644
--- a/datastore/google/cloud/datastore/helpers.py
+++ b/datastore/google/cloud/datastore/helpers.py
@@ -134,7 +134,7 @@ def entity_from_protobuf(pb):
         # Check if ``value_pb`` was excluded from index. Lists need to be
         # special-cased and we require all ``exclude_from_indexes`` values
         # in a list agree.
-        if is_list:
+        if is_list and len(value) > 0:
             exclude_values = set(value_pb.exclude_from_indexes
                                  for value_pb in value_pb.array_value.values)
             if len(exclude_values) != 1:
diff --git a/datastore/setup.py b/datastore/setup.py
index 07cacb703abe..0eccb7781bca 100644
--- a/datastore/setup.py
+++ b/datastore/setup.py
@@ -61,7 +61,7 @@
 
 setup(
     name='google-cloud-datastore',
-    version='1.4.1.dev1',
+    version='10.0.0',
     description='Python Client for Google Cloud Datastore',
     long_description=README,
     namespace_packages=[
diff --git a/src/google-cloud b/src/google-cloud
new file mode 160000
index 000000000000..a7eb5d951959
--- /dev/null
+++ b/src/google-cloud
@@ -0,0 +1 @@
+Subproject commit a7eb5d95195992441c01b92d5ff3ee71aa9250f2
diff --git a/src/pip-delete-this-directory.txt b/src/pip-delete-this-directory.txt
new file mode 100644
index 000000000000..c8883ea99f50
--- /dev/null
+++ b/src/pip-delete-this-directory.txt
@@ -0,0 +1,5 @@
+This file is placed here by pip to indicate the source was put
+here by pip.
+
+Once this package is successfully installed this source code will be
+deleted (unless you remove this file).