diff --git a/AUTHORS b/AUTHORS
index d7c648792..59fdc4cd7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,6 +7,7 @@ Christian Berendt <berendt@b1-systems.de>
 Dmitri Zimine <dz@stackstorm.com>
 Jeremy Stanley <fungi@yuggoth.org>
 Kirill Izotov <enykeev@stackstorm.com>
+Lakshmi Kannan <lakshmi@stackstorm.com>
 Manas Kelshikar <manas@stackstorm.com>
 Nikolay Mahotkin <nmakhotkin@mirantis.com>
 Ray Chen <chenrano2002@gmail.com>
diff --git a/mistral/tests/unit/test_expressions.py b/mistral/tests/unit/test_expressions.py
index b7507a664..938a58aa6 100644
--- a/mistral/tests/unit/test_expressions.py
+++ b/mistral/tests/unit/test_expressions.py
@@ -72,6 +72,7 @@ class YaqlEvaluatorTest(base.BaseTest):
 
     def test_function_length(self):
         # Lists.
+        self.assertEqual(0, expr.evaluate('$.length()', []))
         self.assertEqual(3, expr.evaluate('$.length()', [1, 2, 3]))
         self.assertEqual(2, expr.evaluate('$.length()', ['one', 'two']))
         self.assertEqual(4, expr.evaluate(
@@ -100,6 +101,11 @@ class YaqlEvaluatorTest(base.BaseTest):
             )
         )
 
+        self.assertEqual(
+            0,
+            expr.evaluate("$[$.state = 'active'].length()", [])
+        )
+
 
 class InlineYAQLEvaluatorTest(base.BaseTest):
     def setUp(self):