From 2914a1a319866f8f143160a456b8e2c49c4c8263 Mon Sep 17 00:00:00 2001
From: Jan Steemann <jan@arangodb.com>
Date: Mon, 15 Apr 2013 13:05:31 +0200
Subject: [PATCH 1/2] fixed assertion

---
 arangod/VocBase/compactor.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arangod/VocBase/compactor.c b/arangod/VocBase/compactor.c
index a69159b010..2817828d1e 100644
--- a/arangod/VocBase/compactor.c
+++ b/arangod/VocBase/compactor.c
@@ -395,7 +395,6 @@ static bool Compactifier (TRI_df_marker_t const* marker,
 
     found2 = CONST_CAST(found);
     // the fid won't change
-    TRI_ASSERT_MAINTAINER(found2->_fid == context->_dfi._fid);
 
     // let marker point to the new position
     found2->_data = result;

From 8bd5503c4cd6dc746f1018f7135c20057659515a Mon Sep 17 00:00:00 2001
From: Jan Steemann <jan@arangodb.com>
Date: Tue, 16 Apr 2013 09:22:49 +0200
Subject: [PATCH 2/2] issue #475

---
 CHANGELOG               | 2 ++
 js/actions/api-graph.js | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 02988c5f8f..92d6d016ec 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 v1.3.0-alpha1 (XXXX-XX-XX)
 --------------------------
 
+* issue #475: A better error message for deleting a non-existent graph
+
 * issue #474: Web interface problems with the JS Shell
  
 * added missing documentation for AQL UNION function
diff --git a/js/actions/api-graph.js b/js/actions/api-graph.js
index f48b63093e..67ee625e92 100644
--- a/js/actions/api-graph.js
+++ b/js/actions/api-graph.js
@@ -370,9 +370,13 @@ function get_graph_graph (req, res) {
 function delete_graph_graph (req, res) {
   try {
     var g = graph_by_request(req);
+    if (g === null || g === undefined) {
+      throw "graph not found";
+    }
   }
   catch (err) {
     actions.resultNotFound(req, res, actions.ERROR_GRAPH_INVALID_GRAPH, err);
+    return;
   }
     
   if (matchError(req, res, g._properties, actions.ERROR_GRAPH_INVALID_GRAPH)) {