diff --git a/js/common/bootstrap/errors.js b/js/common/bootstrap/errors.js
index 10451f6421..804b8d3787 100644
--- a/js/common/bootstrap/errors.js
+++ b/js/common/bootstrap/errors.js
@@ -259,8 +259,8 @@
     "ERROR_GRAPH_NOT_FOUND"        : { "code" : 1924, "message" : "graph '%s' not found" },
     "ERROR_GRAPH_DUPLICATE"        : { "code" : 1925, "message" : "graph already exists" },
     "ERROR_GRAPH_VERTEX_COL_DOES_NOT_EXIST" : { "code" : 1926, "message" : "vertex collection does not exist or is not part of the graph" },
-    "ERROR_GRAPH_WRONG_COLLECTION_TYPE_VERTEX" : { "code" : 1927, "message" : "not a vertex collection" },
-    "ERROR_GRAPH_NOT_IN_ORPHAN_COLLECTION" : { "code" : 1928, "message" : "not in orphan collection" },
+    "ERROR_GRAPH_WRONG_COLLECTION_TYPE_VERTEX" : { "code" : 1927, "message" : "collection not a vertex collection" },
+    "ERROR_GRAPH_NOT_IN_ORPHAN_COLLECTION" : { "code" : 1928, "message" : "collection is not in list of orphan collections" },
     "ERROR_GRAPH_COLLECTION_USED_IN_EDGE_DEF" : { "code" : 1929, "message" : "collection already used in edge def" },
     "ERROR_GRAPH_EDGE_COLLECTION_NOT_USED" : { "code" : 1930, "message" : "edge collection not used in graph" },
     "ERROR_GRAPH_NO_GRAPH_COLLECTION" : { "code" : 1932, "message" : "collection _graphs does not exist" },
diff --git a/lib/Basics/errors.dat b/lib/Basics/errors.dat
index 44d1aa59bf..995bbea3eb 100755
--- a/lib/Basics/errors.dat
+++ b/lib/Basics/errors.dat
@@ -349,8 +349,8 @@ ERROR_GRAPH_CREATE_MALFORMED_EDGE_DEFINITION,1923,"malformed edge definition","t
 ERROR_GRAPH_NOT_FOUND,1924,"graph '%s' not found","a graph with this name could not be found.",
 ERROR_GRAPH_DUPLICATE,1925,"graph already exists","a graph with this name already exists.",
 ERROR_GRAPH_VERTEX_COL_DOES_NOT_EXIST,1926,"vertex collection does not exist or is not part of the graph","the specified vertex collection does not exist or is not part of the graph.",
-ERROR_GRAPH_WRONG_COLLECTION_TYPE_VERTEX,1927,"not a vertex collection","the collection is not a vertex collection.",
-ERROR_GRAPH_NOT_IN_ORPHAN_COLLECTION,1928,"not in orphan collection","Vertex collection not in orphan collection of the graph.",
+ERROR_GRAPH_WRONG_COLLECTION_TYPE_VERTEX,1927,"collection not a vertex collection","the collection is not a vertex collection.",
+ERROR_GRAPH_NOT_IN_ORPHAN_COLLECTION,1928,"collection is not in list of orphan collections","Vertex collection not in list of orphan collections of the graph.",
 ERROR_GRAPH_COLLECTION_USED_IN_EDGE_DEF,1929,"collection already used in edge def","The collection is already used in an edge definition of the graph.",
 ERROR_GRAPH_EDGE_COLLECTION_NOT_USED,1930,"edge collection not used in graph","The edge collection is not used in any edge definition of the graph.",
 ERROR_GRAPH_NO_GRAPH_COLLECTION,1932,"collection _graphs does not exist","collection _graphs does not exist.",
diff --git a/lib/Basics/voc-errors.cpp b/lib/Basics/voc-errors.cpp
index 4df1677cef..295a36f87e 100644
--- a/lib/Basics/voc-errors.cpp
+++ b/lib/Basics/voc-errors.cpp
@@ -259,8 +259,8 @@ void TRI_InitializeErrorMessages() {
   REG_ERROR(ERROR_GRAPH_NOT_FOUND, "graph '%s' not found");
   REG_ERROR(ERROR_GRAPH_DUPLICATE, "graph already exists");
   REG_ERROR(ERROR_GRAPH_VERTEX_COL_DOES_NOT_EXIST, "vertex collection does not exist or is not part of the graph");
-  REG_ERROR(ERROR_GRAPH_WRONG_COLLECTION_TYPE_VERTEX, "not a vertex collection");
-  REG_ERROR(ERROR_GRAPH_NOT_IN_ORPHAN_COLLECTION, "not in orphan collection");
+  REG_ERROR(ERROR_GRAPH_WRONG_COLLECTION_TYPE_VERTEX, "collection not a vertex collection");
+  REG_ERROR(ERROR_GRAPH_NOT_IN_ORPHAN_COLLECTION, "collection is not in list of orphan collections");
   REG_ERROR(ERROR_GRAPH_COLLECTION_USED_IN_EDGE_DEF, "collection already used in edge def");
   REG_ERROR(ERROR_GRAPH_EDGE_COLLECTION_NOT_USED, "edge collection not used in graph");
   REG_ERROR(ERROR_GRAPH_NO_GRAPH_COLLECTION, "collection _graphs does not exist");
diff --git a/lib/Basics/voc-errors.h b/lib/Basics/voc-errors.h
index fc83c56135..0c0de06a6f 100644
--- a/lib/Basics/voc-errors.h
+++ b/lib/Basics/voc-errors.h
@@ -1369,13 +1369,13 @@ constexpr int TRI_ERROR_GRAPH_DUPLICATE
 constexpr int TRI_ERROR_GRAPH_VERTEX_COL_DOES_NOT_EXIST                         = 1926;
 
 /// 1927: ERROR_GRAPH_WRONG_COLLECTION_TYPE_VERTEX
-/// "not a vertex collection"
+/// "collection not a vertex collection"
 /// the collection is not a vertex collection.
 constexpr int TRI_ERROR_GRAPH_WRONG_COLLECTION_TYPE_VERTEX                      = 1927;
 
 /// 1928: ERROR_GRAPH_NOT_IN_ORPHAN_COLLECTION
-/// "not in orphan collection"
-/// Vertex collection not in orphan collection of the graph.
+/// "collection is not in list of orphan collections"
+/// Vertex collection not in list of orphan collections of the graph.
 constexpr int TRI_ERROR_GRAPH_NOT_IN_ORPHAN_COLLECTION                          = 1928;
 
 /// 1929: ERROR_GRAPH_COLLECTION_USED_IN_EDGE_DEF
diff --git a/tests/rb/HttpInterface/api-general-graph-spec.rb b/tests/rb/HttpInterface/api-general-graph-spec.rb
index f2745cc17f..f4f49cc6f0 100644
--- a/tests/rb/HttpInterface/api-general-graph-spec.rb
+++ b/tests/rb/HttpInterface/api-general-graph-spec.rb
@@ -1205,7 +1205,6 @@ describe ArangoDB do
               doc.parsed_response['error'].should eq(true)
               doc.parsed_response['code'].should eq(400)
               puts doc.parsed_response['errorMessage']
-              doc.parsed_response['errorMessage'].should include("not in orphan collection")
             end
 
             def check404CRUD (doc)