diff --git a/arangod/Aql/ExecutionBlock.cpp b/arangod/Aql/ExecutionBlock.cpp
index fa416ecd70..6c182aaede 100644
--- a/arangod/Aql/ExecutionBlock.cpp
+++ b/arangod/Aql/ExecutionBlock.cpp
@@ -3363,7 +3363,7 @@ int SortedAggregateBlock::getOrSkipSome (size_t atLeast,
         try {
           // emit last buffered group
           if (! skipping) {
-            TRI_IF_FAILURE("AggregateBlock::getOrSkipSome") {
+            TRI_IF_FAILURE("SortedAggregateBlock::getOrSkipSome") {
               THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG);
             }
 
@@ -3649,7 +3649,7 @@ int HashedAggregateBlock::getOrSkipSome (size_t atLeast,
         try {
           // emit last buffered group
           if (! skipping) {
-            TRI_IF_FAILURE("HashAggregateBlock::getOrSkipSome") {
+            TRI_IF_FAILURE("HashedAggregateBlock::getOrSkipSome") {
               THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG);
             }
           }
diff --git a/js/server/tests/aql-failures.js b/js/server/tests/aql-failures.js
index af51cae26d..1eb4baf5c3 100644
--- a/js/server/tests/aql-failures.js
+++ b/js/server/tests/aql-failures.js
@@ -78,7 +78,7 @@ function ahuacatlFailureSuite () {
 /// @brief test failure
 ////////////////////////////////////////////////////////////////////////////////
 
-    testAggregateBlock1 : function () {
+    testSortedAggregateBlock1 : function () {
       internal.debugSetFailAt("AggregatorGroup::addValues");
       assertFailingQuery("FOR i IN " + c.name() + " COLLECT key = i.value INTO g RETURN [ key, g ]");
       assertFailingQuery("FOR i IN " + c.name() + " COLLECT key = i.value2 INTO g RETURN [ key, g ]");
@@ -88,13 +88,24 @@ function ahuacatlFailureSuite () {
 /// @brief test failure
 ////////////////////////////////////////////////////////////////////////////////
 
-    testAggregateBlock2 : function () {
-      internal.debugSetFailAt("AggregateBlock::getOrSkipSome");
+    testSortedAggregateBlock2 : function () {
+      internal.debugSetFailAt("SortedAggregateBlock::getOrSkipSome");
       assertFailingQuery("FOR i IN " + c.name() + " COLLECT key = i.value INTO g RETURN [ key, g ]");
       assertFailingQuery("FOR i IN " + c.name() + " COLLECT key = i.value2 INTO g RETURN [ key, g ]");
       assertFailingQuery("FOR i IN 1..10000 COLLECT key = i INTO g RETURN [ key, g ]");
     },
 
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test failure
+////////////////////////////////////////////////////////////////////////////////
+
+    testHashedAggregateBlock : function () {
+      internal.debugSetFailAt("HashedAggregateBlock::getOrSkipSome");
+      assertFailingQuery("FOR i IN " + c.name() + " COLLECT key = i.value RETURN key");
+      assertFailingQuery("FOR i IN " + c.name() + " COLLECT key = i.value2 RETURN key");
+      assertFailingQuery("FOR i IN 1..10000 COLLECT key = i RETURN key");
+    },
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief test failure
 ////////////////////////////////////////////////////////////////////////////////