diff --git a/CHANGELOG b/CHANGELOG
index f280c867fd..3e3a393b50 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 devel
 -----
 
+* fixed issue #5648: fixed error message when saving unsupported document types
+
 * fixed internal issue #2812: Cluster fails to create many indexes in parallel
 
 * Added C++ implementation, load balancer support, and user restriction to Pregel API.
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentView.js
index 2809ad6dec..4fa8b14360 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentView.js
@@ -339,8 +339,12 @@
         this.collection.saveEdge(this.colid, this.docid, $('#document-from').html(), $('#document-to').html(), model, callbackE);
       } else {
         var callback = function (error, data) {
-          if (error) {
-            arangoHelper.arangoError('Error', data.responseJSON.errorMessage);
+          if (error || data[0] && data[0].error) {
+            if (data[0] && data[0].error) {
+              arangoHelper.arangoError('Error', data[0].errorMessage);
+            } else {
+              arangoHelper.arangoError('Error', data.responseJSON.errorMessage);
+            }
           } else {
             this.successConfirmation();
             this.disableSaveButton();