diff --git a/arangod/Aql/AqlValue.h b/arangod/Aql/AqlValue.h
index 2288cb98dc..955a3b39d9 100644
--- a/arangod/Aql/AqlValue.h
+++ b/arangod/Aql/AqlValue.h
@@ -269,6 +269,9 @@ namespace std {
         case triagens::aql::AqlValue::RANGE: {
           return a._range == b._range;
         }
+        // case triagens::aql::AqlValue::EMPTY intentionally not handled here!
+        // (should fall through and fail!)
+
         default: {
           TRI_ASSERT(false);
           return true;
diff --git a/arangod/Aql/V8Executor.cpp b/arangod/Aql/V8Executor.cpp
index d4aa0d9fce..75ff6b7bdf 100644
--- a/arangod/Aql/V8Executor.cpp
+++ b/arangod/Aql/V8Executor.cpp
@@ -851,7 +851,8 @@ void V8Executor::generateCodeNode (AstNode const* node) {
       break;
 
     case NODE_TYPE_VARIABLE:
-      // we're not expecting a variable here
+    case NODE_TYPE_PARAMETER:
+      // we're not expecting these types here
       THROW_ARANGO_EXCEPTION(TRI_ERROR_INTERNAL);
 
     default: