From 253fd6f2bc690cf978af6aad00fa5008b3f43e87 Mon Sep 17 00:00:00 2001
From: Jan Steemann <jan@arangodb.com>
Date: Thu, 7 Aug 2014 17:02:07 +0200
Subject: [PATCH] prevent crashes

---
 arangod/Aql/Query.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/arangod/Aql/Query.cpp b/arangod/Aql/Query.cpp
index ae2a58a7f0..4062a798dd 100644
--- a/arangod/Aql/Query.cpp
+++ b/arangod/Aql/Query.cpp
@@ -205,9 +205,11 @@ QueryResult Query::execute () {
     
         while (nullptr != (value = root->getOne())) {
           AqlValue val = value->getValue(0, 0);
-          TRI_ASSERT(! val.isEmpty());
-          auto doc = value->getDocumentCollection(0);
-          json.add(val.toJson(doc)); 
+
+          if (! val.isEmpty()) {
+            auto doc = value->getDocumentCollection(0);
+            json.add(val.toJson(doc)); 
+          }
           delete value;
         }