diff --git a/js/src/import.js b/js/src/import.js
index c587bc071d..d224e5ada4 100644
--- a/js/src/import.js
+++ b/js/src/import.js
@@ -25,9 +25,11 @@ function changePluginOpts () {
     $('#' + selectedPluginName + '_options').fadeIn('slow');
 
     const importNotification = document.getElementById('import_notification');
-    importNotification.innerText = '';
-    if (selectedPluginName === 'csv') {
-        importNotification.innerHTML = '<div class="alert alert-info mb-0 mt-3" role="alert">' + window.Messages.strImportCSV + '</div>';
+    if (importNotification) {
+        importNotification.innerText = '';
+        if (selectedPluginName === 'csv') {
+            importNotification.innerHTML = '<div class="alert alert-info mb-0 mt-3" role="alert">' + window.Messages.strImportCSV + '</div>';
+        }
     }
 }
 
diff --git a/js/src/modules/functions.js b/js/src/modules/functions.js
index 56eda511d3..094a2b5c64 100644
--- a/js/src/modules/functions.js
+++ b/js/src/modules/functions.js
@@ -452,7 +452,11 @@ Functions.suggestPassword = function (passwordForm) {
     passwordForm.elements.pma_pw2.value = passwd.value;
     var meterObj = $jQueryPasswordForm.find('meter[name="pw_meter"]').first();
     var meterObjLabel = $jQueryPasswordForm.find('span[name="pw_strength"]').first();
-    Functions.checkPasswordStrength(passwd.value, meterObj, meterObjLabel, passwordForm.elements.username.value);
+    var username = '';
+    if (passwordForm.elements.username) {
+        username = passwordForm.elements.username.value;
+    }
+    Functions.checkPasswordStrength(passwd.value, meterObj, meterObjLabel, username);
     return true;
 };
 
diff --git a/libraries/classes/Plugins/Export/ExportXml.php b/libraries/classes/Plugins/Export/ExportXml.php
index 3338f0c1cd..5f9a729dc0 100644
--- a/libraries/classes/Plugins/Export/ExportXml.php
+++ b/libraries/classes/Plugins/Export/ExportXml.php
@@ -258,6 +258,11 @@ class ExportXml extends ExportPlugin
                     . Util::backquote($table),
                     0,
                 );
+
+                if ($result === []) {
+                    continue;
+                }
+
                 $tbl = (string) $result[$table][1];
 
                 $is_view = $GLOBALS['dbi']->getTable($GLOBALS['db'], $table)