diff --git a/arangod/VocBase/key-generator.c b/arangod/VocBase/key-generator.c
index ab279eb513..86456b4fd9 100644
--- a/arangod/VocBase/key-generator.c
+++ b/arangod/VocBase/key-generator.c
@@ -217,7 +217,7 @@ static int RevisionKey (TRI_key_generator_t* const generator,
       current += TRI_StringUInt64InPlace(revision, current);
     }
     else {
-      char numBuffer[22];
+      char numBuffer[22]; // a uint64 cannot be longer than this 
       size_t length;
 
       length = TRI_StringUInt64InPlace(revision, (char*) &numBuffer);
diff --git a/js/client/client.js b/js/client/client.js
index 6e190abe08..f65cf12adf 100755
--- a/js/client/client.js
+++ b/js/client/client.js
@@ -1109,6 +1109,11 @@ function ArangoCollection (database, data) {
 ////////////////////////////////////////////////////////////////////////////////
 
   ArangoCollection.prototype._documenturl = function (id) {
+    var s = id.split("/");
+
+    if (s.length == 1) {
+      return this._database._documenturl(this.name() + "/" + id, this.name()); 
+    }
     return this._database._documenturl(id, this.name()); 
   };
 
@@ -1729,7 +1734,7 @@ function ArangoCollection (database, data) {
     }
 
     if (rev === null) {
-      requestResult = this._database._connection.GET(this._documenturl(this._name + "/" + id));
+      requestResult = this._database._connection.GET(this._documenturl(id));
     }
     else {
       requestResult = this._database._connection.GET(this._documenturl(id),