diff --git a/BasicsC/errors.dat b/BasicsC/errors.dat
index 9f363c85e7..dd74b345dc 100644
--- a/BasicsC/errors.dat
+++ b/BasicsC/errors.dat
@@ -14,6 +14,7 @@ ERROR_DEAD_PID,8,"dead process identifier","Will be raised when a PID without a
 ERROR_NOT_IMPLEMENTED,9,"not implemented","Will be raised when hitting an unimplemented feature."
 ERROR_BAD_PARAMETER,10,"bad parameter","Will be raised when the parameter does not fulfill the requirements."
 ERROR_FORBIDDEN,11,"forbidden","Will be raised when you are missing permission for the operation."
+ERROR_OUT_OF_MEMORY_MMAP,12,"out of memory in mmap","Weill be raised when there is a memory shortage."
 
 ################################################################################
 ## HTTP standard errors
diff --git a/BasicsC/voc-errors.c b/BasicsC/voc-errors.c
index bcfe538210..9f76405400 100644
--- a/BasicsC/voc-errors.c
+++ b/BasicsC/voc-errors.c
@@ -23,6 +23,7 @@ void TRI_InitialiseErrorMessages (void) {
   REG_ERROR(ERROR_NOT_IMPLEMENTED, "not implemented");
   REG_ERROR(ERROR_BAD_PARAMETER, "bad parameter");
   REG_ERROR(ERROR_FORBIDDEN, "forbidden");
+  REG_ERROR(ERROR_OUT_OF_MEMORY_MMAP, "out of memory in mmap");
   REG_ERROR(ERROR_HTTP_BAD_PARAMETER, "bad parameter");
   REG_ERROR(ERROR_HTTP_FORBIDDEN, "forbidden");
   REG_ERROR(ERROR_HTTP_NOT_FOUND, "not found");
diff --git a/BasicsC/voc-errors.h b/BasicsC/voc-errors.h
index 77008f875c..e83f6a3553 100644
--- a/BasicsC/voc-errors.h
+++ b/BasicsC/voc-errors.h
@@ -35,6 +35,8 @@ extern "C" {
 ///   Will be raised when the parameter does not fulfill the requirements.
 /// - 11: @CODE{forbidden}
 ///   Will be raised when you are missing permission for the operation.
+/// - 12: @CODE{out of memory in mmap}
+///   Weill be raised when there is a memory shortage.
 /// - 400: @CODE{bad parameter}
 ///   Will be raised when the HTTP request does not fulfill the requirements.
 /// - 403: @CODE{forbidden}
@@ -396,6 +398,16 @@ void TRI_InitialiseErrorMessages (void);
 
 #define TRI_ERROR_FORBIDDEN                                               (11)
 
+////////////////////////////////////////////////////////////////////////////////
+/// @brief 12: ERROR_OUT_OF_MEMORY_MMAP
+///
+/// out of memory in mmap
+///
+/// Weill be raised when there is a memory shortage.
+////////////////////////////////////////////////////////////////////////////////
+
+#define TRI_ERROR_OUT_OF_MEMORY_MMAP                                      (12)
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief 400: ERROR_HTTP_BAD_PARAMETER
 ///
diff --git a/js/common/bootstrap/errors.js b/js/common/bootstrap/errors.js
index f5a05dd198..234ba69a37 100644
--- a/js/common/bootstrap/errors.js
+++ b/js/common/bootstrap/errors.js
@@ -17,6 +17,7 @@ ModuleCache["/internal"].exports.errors = {
   "ERROR_NOT_IMPLEMENTED"        : { "code" : 9, "message" : "not implemented" }, 
   "ERROR_BAD_PARAMETER"          : { "code" : 10, "message" : "bad parameter" }, 
   "ERROR_FORBIDDEN"              : { "code" : 11, "message" : "forbidden" }, 
+  "ERROR_OUT_OF_MEMORY_MMAP"     : { "code" : 12, "message" : "out of memory in mmap" }, 
   "ERROR_HTTP_BAD_PARAMETER"     : { "code" : 400, "message" : "bad parameter" }, 
   "ERROR_HTTP_FORBIDDEN"         : { "code" : 403, "message" : "forbidden" }, 
   "ERROR_HTTP_NOT_FOUND"         : { "code" : 404, "message" : "not found" }, 
diff --git a/js/common/bootstrap/js-errors.h b/js/common/bootstrap/js-errors.h
index aa27d6f489..576c0d3dc9 100644
--- a/js/common/bootstrap/js-errors.h
+++ b/js/common/bootstrap/js-errors.h
@@ -18,6 +18,7 @@ static string JS_common_bootstrap_errors =
   "  \"ERROR_NOT_IMPLEMENTED\"        : { \"code\" : 9, \"message\" : \"not implemented\" }, \n"
   "  \"ERROR_BAD_PARAMETER\"          : { \"code\" : 10, \"message\" : \"bad parameter\" }, \n"
   "  \"ERROR_FORBIDDEN\"              : { \"code\" : 11, \"message\" : \"forbidden\" }, \n"
+  "  \"ERROR_OUT_OF_MEMORY_MMAP\"     : { \"code\" : 12, \"message\" : \"out of memory in mmap\" }, \n"
   "  \"ERROR_HTTP_BAD_PARAMETER\"     : { \"code\" : 400, \"message\" : \"bad parameter\" }, \n"
   "  \"ERROR_HTTP_FORBIDDEN\"         : { \"code\" : 403, \"message\" : \"forbidden\" }, \n"
   "  \"ERROR_HTTP_NOT_FOUND\"         : { \"code\" : 404, \"message\" : \"not found\" }, \n"