diff --git a/modules/ROOT/content-nav.adoc b/modules/ROOT/content-nav.adoc
index c8cd56be..eea78640 100644
--- a/modules/ROOT/content-nav.adoc
+++ b/modules/ROOT/content-nav.adoc
@@ -26,10 +26,15 @@
 **** xref:errors/gql-errors/08N16.adoc[]
 **** xref:errors/gql-errors/08N17.adoc[]
 **** xref:errors/gql-errors/08N18.adoc[]
+**** xref:errors/gql-errors/08N19.adoc[]
+**** xref:errors/gql-errors/08N20.adoc[]
+**** xref:errors/gql-errors/08N21.adoc[]
 *** xref:errors/gql-errors/index.adoc#data-exceptions[Data exceptions]
 **** xref:errors/gql-errors/22000.adoc[]
 **** xref:errors/gql-errors/22003.adoc[]
+**** xref:errors/gql-errors/22004.adoc[]
 **** xref:errors/gql-errors/22007.adoc[]
+**** xref:errors/gql-errors/22012.adoc[]
 **** xref:errors/gql-errors/22015.adoc[]
 **** xref:errors/gql-errors/22G03.adoc[]
 **** xref:errors/gql-errors/22G05.adoc[]
@@ -247,6 +252,7 @@
 **** xref:errors/gql-errors/42N07.adoc[]
 **** xref:errors/gql-errors/42N08.adoc[]
 **** xref:errors/gql-errors/42N09.adoc[]
+**** xref:errors/gql-errors/42N0A.adoc[]
 **** xref:errors/gql-errors/42N0B.adoc[]
 **** xref:errors/gql-errors/42N10.adoc[]
 **** xref:errors/gql-errors/42N11.adoc[]
@@ -275,6 +281,9 @@
 **** xref:errors/gql-errors/42N37.adoc[]
 **** xref:errors/gql-errors/42N38.adoc[]
 **** xref:errors/gql-errors/42N39.adoc[]
+**** xref:errors/gql-errors/42N3A.adoc[]
+**** xref:errors/gql-errors/42N3B.adoc[]
+**** xref:errors/gql-errors/42N3C.adoc[]
 **** xref:errors/gql-errors/42N40.adoc[]
 **** xref:errors/gql-errors/42N41.adoc[]
 **** xref:errors/gql-errors/42N42.adoc[]
@@ -353,6 +362,9 @@
 **** xref:errors/gql-errors/50N15.adoc[]
 **** xref:errors/gql-errors/50N16.adoc[]
 **** xref:errors/gql-errors/50N17.adoc[]
+**** xref:errors/gql-errors/50N18.adoc[]
+**** xref:errors/gql-errors/50N19.adoc[]
+**** xref:errors/gql-errors/50N20.adoc[]
 **** xref:errors/gql-errors/50N21.adoc[]
 **** xref:errors/gql-errors/50N23.adoc[]
 **** xref:errors/gql-errors/50N42.adoc[]
@@ -448,6 +460,7 @@
 **** xref:errors/gql-errors/52N17.adoc[]
 **** xref:errors/gql-errors/52N18.adoc[]
 **** xref:errors/gql-errors/52N19.adoc[]
+**** xref:errors/gql-errors/52N21.adoc[]
 **** xref:errors/gql-errors/52N22.adoc[]
 **** xref:errors/gql-errors/52N23.adoc[]
 **** xref:errors/gql-errors/52N24.adoc[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N19.adoc b/modules/ROOT/pages/errors/gql-errors/08N19.adoc
new file mode 100644
index 00000000..01836a70
--- /dev/null
+++ b/modules/ROOT/pages/errors/gql-errors/08N19.adoc
@@ -0,0 +1,12 @@
+= 08N19
+
+== Status description
+error: connection exception - shard execution transient error. Communication with shard `{ <<graph>> }` failed. with message `{ <<msg>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N20.adoc b/modules/ROOT/pages/errors/gql-errors/08N20.adoc
new file mode 100644
index 00000000..6c49f46b
--- /dev/null
+++ b/modules/ROOT/pages/errors/gql-errors/08N20.adoc
@@ -0,0 +1,12 @@
+= 08N20
+
+== Status description
+error: connection exception - shard execution database error. Communication with shard `{ <<graph>> }` failed. with message `{ <<msg>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/08N21.adoc b/modules/ROOT/pages/errors/gql-errors/08N21.adoc
new file mode 100644
index 00000000..ec61d507
--- /dev/null
+++ b/modules/ROOT/pages/errors/gql-errors/08N21.adoc
@@ -0,0 +1,12 @@
+= 08N21
+
+== Status description
+error: connection exception - shard execution client error. Communication with shard `{ <<graph>> }` failed. with message `{ <<msg>> }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22004.adoc b/modules/ROOT/pages/errors/gql-errors/22004.adoc
new file mode 100644
index 00000000..d7f0074f
--- /dev/null
+++ b/modules/ROOT/pages/errors/gql-errors/22004.adoc
@@ -0,0 +1,13 @@
+= 22004
+
+== Status description
+
+error: data exception - null value not allowed
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/22012.adoc b/modules/ROOT/pages/errors/gql-errors/22012.adoc
new file mode 100644
index 00000000..c96b3e13
--- /dev/null
+++ b/modules/ROOT/pages/errors/gql-errors/22012.adoc
@@ -0,0 +1,13 @@
+= 22012
+
+== Status description
+
+error: data exception - division by zero
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N0A.adoc b/modules/ROOT/pages/errors/gql-errors/42N0A.adoc
new file mode 100644
index 00000000..972c6f99
--- /dev/null
+++ b/modules/ROOT/pages/errors/gql-errors/42N0A.adoc
@@ -0,0 +1,13 @@
+= 42N0A
+
+== Status description
+
+error: syntax error or access rule violation - invalid shard target. `{ <<action>> }` is not allowed with a shard target. Connect to `{ <<db>>1 }` in order to read or write data from `{ db2 }`.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N3A.adoc b/modules/ROOT/pages/errors/gql-errors/42N3A.adoc
new file mode 100644
index 00000000..6f320944
--- /dev/null
+++ b/modules/ROOT/pages/errors/gql-errors/42N3A.adoc
@@ -0,0 +1,13 @@
+= 42N3A
+
+== Status description
+
+error: syntax error or access rule violation - incompatible conditional query. All `{ <<context>> }` need to either return rows or update the graph.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N3B.adoc b/modules/ROOT/pages/errors/gql-errors/42N3B.adoc
new file mode 100644
index 00000000..24fb2fb0
--- /dev/null
+++ b/modules/ROOT/pages/errors/gql-errors/42N3B.adoc
@@ -0,0 +1,13 @@
+= 42N3B
+
+== Status description
+
+error: syntax error or access rule violation - incompatible number of return columns. All `{ <<context>> }` must return the same number of columns.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/42N3C.adoc b/modules/ROOT/pages/errors/gql-errors/42N3C.adoc
new file mode 100644
index 00000000..3c53f0cd
--- /dev/null
+++ b/modules/ROOT/pages/errors/gql-errors/42N3C.adoc
@@ -0,0 +1,13 @@
+= 42N3C
+
+== Status description
+
+error: syntax error or access rule violation - invalid use of `CALL { ... }`. Not possible to enclose `{ <<clause>> }` in `CALL { ... }`. Use `CALL () { ... }` instead.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/50N18.adoc b/modules/ROOT/pages/errors/gql-errors/50N18.adoc
new file mode 100644
index 00000000..a16427e8
--- /dev/null
+++ b/modules/ROOT/pages/errors/gql-errors/50N18.adoc
@@ -0,0 +1,13 @@
+= 50N18
+
+== Status description
+
+error: general processing exception - shard execution transient error. Communication with shard `{ <<graph>> }` failed. See cause for more details.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/50N19.adoc b/modules/ROOT/pages/errors/gql-errors/50N19.adoc
new file mode 100644
index 00000000..85c66bff
--- /dev/null
+++ b/modules/ROOT/pages/errors/gql-errors/50N19.adoc
@@ -0,0 +1,13 @@
+= 50N19
+
+== Status description
+
+error: general processing exception - shard execution database error. Communication with shard `{ <<graph>> }` failed. See cause for more details.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/50N20.adoc b/modules/ROOT/pages/errors/gql-errors/50N20.adoc
new file mode 100644
index 00000000..aee173ec
--- /dev/null
+++ b/modules/ROOT/pages/errors/gql-errors/50N20.adoc
@@ -0,0 +1,13 @@
+= 50N20
+
+== Status description
+
+error: general processing exception - shard execution client error. Communication with shard `{ <<graph>> }` failed. See cause for more details.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/52N21.adoc b/modules/ROOT/pages/errors/gql-errors/52N21.adoc
new file mode 100644
index 00000000..c2552d34
--- /dev/null
+++ b/modules/ROOT/pages/errors/gql-errors/52N21.adoc
@@ -0,0 +1,13 @@
+= 52N21
+
+== Status description
+
+error: procedure exception - failed to clean the system graph. Failed to clean the system graph.
+
+
+ifndef::backend-pdf[]
+[discrete.glossary]
+== Glossary
+
+include::partial$glossary.adoc[]
+endif::[]
diff --git a/modules/ROOT/pages/errors/gql-errors/index.adoc b/modules/ROOT/pages/errors/gql-errors/index.adoc
index 1575bdc1..232cff52 100644
--- a/modules/ROOT/pages/errors/gql-errors/index.adoc
+++ b/modules/ROOT/pages/errors/gql-errors/index.adoc
@@ -103,6 +103,19 @@ Status description:: error: connection exception - general driver transient erro
 
 Status description:: error: connection exception - general driver database error. Remote execution failed with message `{ <<msg>> }`.
 
+=== xref:errors/gql-errors/08N19.adoc[08N19]
+
+Status description:: error: connection exception - shard execution transient error. Communication with shard `{ <<graph>> }` failed. with message `{ <<msg>> }`.
+
+=== xref:errors/gql-errors/08N20.adoc[08N20]
+
+Status description:: error: connection exception - shard execution database error. Communication with shard `{ <<graph>> }` failed. with message `{ <<msg>> }`.
+
+=== xref:errors/gql-errors/08N21.adoc[08N21]
+
+Status description:: error: connection exception - shard execution client error. Communication with shard `{ <<graph>> }` failed. with message `{ <<msg>> }`.
+
+
 [[data-exceptions]]
 == Data exceptions
 
@@ -117,10 +130,18 @@ Status description:: error: data exception
 
 Status description:: error: data exception - numeric value out of range. The numeric value `{ <<value>> }` is outside the required range.
 
+=== xref:errors/gql-errors/22004.adoc[22004]
+
+Status description:: error: data exception - null value not allowed
+
 === xref:errors/gql-errors/22007.adoc[22007]
 
 Status description:: error: data exception - invalid date, time, or datetime format
 
+=== xref:errors/gql-errors/22012.adoc[22012]
+
+Status description:: error: data exception - division by zero
+
 === xref:errors/gql-errors/22015.adoc[22015]
 
 Status description:: error: data exception - interval field overflow
@@ -1005,6 +1026,10 @@ Status description:: error: syntax error or access rule violation - no such proc
 
 Status description:: error: syntax error or access rule violation - no such user. A user with the name `{ <<user>> }` was not found. Verify that the spelling is correct.
 
+=== xref:errors/gql-errors/42N0A.adoc[42N0A]
+
+Status description:: error: syntax error or access rule violation - invalid shard target. `{ <<action>> }` is not allowed with a shard target. Connect to `{ <<db>>1 }` in order to read or write data from `{ db2 }`.
+
 === xref:errors/gql-errors/42N0B.adoc[42N0B]
 
 Status description:: error: syntax error or access rule violation - cannot replace sharded database. The database identified by `{ <<db>>1 }` is sharded. Drop the database `{ <<db>>2 }` before recreating.
@@ -1121,6 +1146,19 @@ Status description:: error: syntax error or access rule violation - duplicate re
 
 Status description:: error: syntax error or access rule violation - incompatible return column names. All `{<<context>>}` must have the same return column names. Use `AS` to ensure columns have the same name.
 
+=== xref:errors/gql-errors/42N3A.adoc[42N3A]
+
+Status description:: error: syntax error or access rule violation - incompatible conditional query. All `{ <<context>> }` need to either return rows or update the graph. 
+
+=== xref:errors/gql-errors/42N3B.adoc[42N3B]
+
+Status description:: error: syntax error or access rule violation - incompatible number of return columns. All `{ <<context>> }` must return the same number of columns.
+
+=== xref:errors/gql-errors/42N3C.adoc[42N3C]
+
+Status description:: error: syntax error or access rule violation - invalid use of `CALL { ... }`. Not possible to enclose `{ <<clause>> }` in `CALL { ... }`. Use `CALL () { ... }` instead.
+
+
 === xref:errors/gql-errors/42N40.adoc[42N40]
 
 Status description:: error: syntax error or access rule violation - single relationship pattern required. The `{ <<fun>> }` function must contain one relationship pattern.
@@ -1135,7 +1173,7 @@ Status description:: error: syntax error or access rule violation - unsupported
 
 === xref:errors/gql-errors/42N44.adoc[42N44]
 
-Status description:: error: syntax error or access rule violation - inaccessible variable. It is not possible to access the variable `{ <<var>> }` declared before the `{ <<clause>> }` clause when using `DISTINCT` or an aggregation.
+Status description:: error: syntax error or access rule violation - inaccessible variable. It is not possible to access the variable `{ <<variable>> }` declared before the `{ <<clause>> }` clause when using `DISTINCT` or an aggregation.
 
 === xref:errors/gql-errors/42N45.adoc[42N45]
 
@@ -1439,6 +1477,18 @@ Status description:: error: general processing exception - remote execution tran
 
 Status description:: error: general processing exception - remote execution database error. Remote execution failed. See cause for more details.
 
+=== xref:errors/gql-errors/50N18.adoc[50N18]
+
+Status description:: error: general processing exception - shard execution transient error. Communication with shard `{ <<graph>> }` failed. See cause for more details.
+
+=== xref:errors/gql-errors/50N19.adoc[50N19]
+
+Status description:: error: general processing exception - shard execution database error. Communication with shard `{ <<graph>> }` failed. See cause for more details.
+
+=== xref:errors/gql-errors/50N20.adoc[50N20]
+
+Status description:: error: general processing exception - shard execution client error. Communication with shard `{ <<graph>> }` failed. See cause for more details.
+
 === xref:errors/gql-errors/50N21.adoc[50N21]
 
 Status description:: error: general processing exception - no such schema descriptor. The `{ <<schemaDescrType>> }` was not found for `{ <<schemaDescr>> }`. Verify that the spelling is correct.
@@ -1870,6 +1920,10 @@ Status description:: error: procedure exception - too many seeders. The number o
 
 Status description:: error: procedure exception - no such seeder. The specified seeding server with id `{ <<server>> }` was not found. Verify that the spelling is correct.
 
+=== xref:errors/gql-errors/52N21.adoc[52N21]
+
+Status description:: error: procedure exception - failed to clean the system graph. Failed to clean the system graph.
+
 === xref:errors/gql-errors/52N22.adoc[52N22]
 
 Status description:: error: procedure exception - invalid procedure argument. Invalid argument `{ <<field>> }` for `{ <<procParam>> }` on procedure `{ <<proc>> }`. The expected format of `{ <<procParam>> }` is `{ <<procParamFmt>> }`.