diff --git a/arangod/Cluster/ClusterMethods.cpp b/arangod/Cluster/ClusterMethods.cpp index 5989946c1d..80c6c8f3df 100644 --- a/arangod/Cluster/ClusterMethods.cpp +++ b/arangod/Cluster/ClusterMethods.cpp @@ -898,7 +898,7 @@ int getDocumentOnCoordinator ( } if (res->status == CL_COMM_ERROR) { // This could be a broken connection or an Http error: - if (!res->result->isComplete()) { + if (!res->result || !res->result->isComplete()) { delete res; return TRI_ERROR_CLUSTER_CONNECTION_LOST; } diff --git a/js/apps/system/aardvark/frontend/js/templates/edgeDefinitionTable.ejs b/js/apps/system/aardvark/frontend/js/templates/edgeDefinitionTable.ejs index 6a3d157a86..717292f8f3 100644 --- a/js/apps/system/aardvark/frontend/js/templates/edgeDefinitionTable.ejs +++ b/js/apps/system/aardvark/frontend/js/templates/edgeDefinitionTable.ejs @@ -2,7 +2,7 @@