diff --git a/Duplicati/Server/webroot/ngax/scripts/directives/sourceFolderPicker.js b/Duplicati/Server/webroot/ngax/scripts/directives/sourceFolderPicker.js
index c8e03de45..27b77a6bd 100644
--- a/Duplicati/Server/webroot/ngax/scripts/directives/sourceFolderPicker.js
+++ b/Duplicati/Server/webroot/ngax/scripts/directives/sourceFolderPicker.js
@@ -412,7 +412,7 @@ backupApp.directive('sourceFolderPicker', function() {
         }, AppUtils.connectionError);
 
         AppService.get('/hyperv', {path: '/'}).then(function(data) {
-            if (data.data.length > 0) {
+            if (data.data != null && data.data.length > 0) {
                 var hypervnode = {
                     text: gettextCatalog.getString('Hyper-V Machines'),
                     id: "%HYPERV%",
@@ -444,7 +444,7 @@ backupApp.directive('sourceFolderPicker', function() {
         }, AppUtils.connectionError);
 
         AppService.get('/mssql', { path: '/' }).then(function (data) {
-            if (data.data.length > 0) {
+            if (data.data != null && data.data.length > 0) {
                 var mssqlnode = {
                     text: gettextCatalog.getString('Microsoft SQL Databases'),
                     id: "%MSSQL%",