diff --git a/dashboard-ui/components/fileorganizer/fileorganizer.js b/dashboard-ui/components/fileorganizer/fileorganizer.js
index 714a9c8060..d2ca45d812 100644
--- a/dashboard-ui/components/fileorganizer/fileorganizer.js
+++ b/dashboard-ui/components/fileorganizer/fileorganizer.js
@@ -4,14 +4,17 @@
     var extractedYear;
     var currentNewItem;
     var existingSeriesHtml;
+    var seriesLocationsCount = 0;
 
     function onApiFailure(e) {
 
         Dashboard.hideLoadingMsg();
 
-        Dashboard.alert({
-            title: Globalize.translate('AutoOrganizeError'),
-            message: Globalize.translate('ErrorOrganizingFileWithErrorCode', e.getResponseHeader("X-Application-Error-Code"))
+        require(['alert'], function (alert) {
+            alert({
+                title: Globalize.translate('AutoOrganizeError'),
+                text: Globalize.translate('ErrorOrganizingFileWithErrorCode', e.headers.get("X-Application-Error-Code"))
+            });
         });
     }
 
@@ -29,7 +32,7 @@
         context.querySelector('#txtSeason').value = item.ExtractedSeasonNumber;
         context.querySelector('#txtEpisode').value = item.ExtractedEpisodeNumber;
         context.querySelector('#txtEndingEpisode').value = item.ExtractedEndingEpisodeNumber;
-        //context.querySelector('.extractedName').value = item.ExtractedName;
+        //context.querySelector('.extractedName').innerHTML = item.ExtractedName;
 
         extractedName = item.ExtractedName;
         extractedYear = item.ExtractedYear;
@@ -79,6 +82,8 @@
                     }
                 }
 
+                seriesLocationsCount = seriesLocations.length;
+
                 var seriesFolderHtml = seriesLocations.map(function (s) {
                     return '<option value="' + s.value + '">' + s.display + '</option>';
                 }).join('');
@@ -140,6 +145,17 @@
 
     function showNewSeriesDialog(dlg) {
 
+        if (seriesLocationsCount == 0) {
+
+            require(['alert'], function (alert) {
+                alert({
+                    title: Globalize.translate('AutoOrganizeError'),
+                    text: Globalize.translate('NoTvFoldersConfigured')
+                });
+            });
+            return;
+        }
+
         require(['components/itemidentifier/itemidentifier'], function (itemidentifier) {
 
             itemidentifier.showFindNew(extractedName, extractedYear, 'Series').then(function (newItem) {
diff --git a/dashboard-ui/scripts/autoorganizelog.js b/dashboard-ui/scripts/autoorganizelog.js
index 2a02171776..4b076460e8 100644
--- a/dashboard-ui/scripts/autoorganizelog.js
+++ b/dashboard-ui/scripts/autoorganizelog.js
@@ -11,23 +11,22 @@
     function showStatusMessage(id) {
 
         var item = currentResult.Items.filter(function (i) {
-            return i.Id == id;
 
+            return i.Id == id;
         })[0];
 
         Dashboard.alert({
 
             title: getStatusText(item, false),
             message: item.StatusMessage
-
         });
     }
 
     function deleteOriginalFile(page, id) {
 
         var item = currentResult.Items.filter(function (i) {
-            return i.Id == id;
 
+            return i.Id == id;
         })[0];
 
         var message = Globalize.translate('MessageFileWillBeDeleted') + '<br/><br/>' + item.OriginalPath + '<br/><br/>' + Globalize.translate('MessageSureYouWishToProceed');
@@ -67,8 +66,8 @@
     function organizeFile(page, id) {
 
         var item = currentResult.Items.filter(function (i) {
-            return i.Id == id;
 
+            return i.Id == id;
         })[0];
 
         if (!item.TargetPath) {
@@ -118,7 +117,6 @@
 
             Dashboard.hideLoadingMsg();
         }, onApiFailure);
-
     }
 
     function getStatusText(item, enhance) {
@@ -149,7 +147,6 @@
             }
         }
 
-
         return status;
     }
 
@@ -193,7 +190,6 @@
 
             html += '<td class="organizerButtonCell">';
 
-
             if (item.Status != 'Success') {
                 html += '<paper-icon-button data-resultid="' + item.Id + '" icon="folder" class="btnProcessResult organizerButton" title="' + Globalize.translate('ButtonOrganizeFile') + '"></paper-icon-button>';
                 html += '<paper-icon-button data-resultid="' + item.Id + '" icon="delete" class="btnDeleteResult organizerButton" title="' + Globalize.translate('ButtonDeleteFile') + '"></paper-icon-button>';
@@ -206,7 +202,7 @@
             return html;
         }).join('');
 
-        var elem = $('.resultBody', page).html(rows).parents('.tblOrganizationResults').table("refresh").trigger('create');
+        var elem = $('.resultBody', page).html(rows).parents('.tblOrganizationResults').table('refresh').trigger('create');
 
         $('.btnShowStatusMessage', elem).on('click', function () {
 
@@ -240,17 +236,21 @@
         $(page)[0].querySelector('.listTopPaging').innerHTML = pagingHtml;
 
         if (result.TotalRecordCount > query.Limit && result.TotalRecordCount > 50) {
+
             $('.listBottomPaging', page).html(pagingHtml).trigger('create');
         } else {
+
             $('.listBottomPaging', page).empty();
         }
 
         $('.btnNextPage', page).on('click', function () {
+
             query.StartIndex += query.Limit;
             reloadItems(page);
         });
 
         $('.btnPreviousPage', page).on('click', function () {
+
             query.StartIndex -= query.Limit;
             reloadItems(page);
         });
@@ -276,19 +276,18 @@
 
         Dashboard.hideLoadingMsg();
 
-        var page = $.mobile.activePage;
-        $('.episodeCorrectionPopup', page).popup("close");
-
         if (e.status == 0) {
+
             Dashboard.alert({
                 title: 'Auto-Organize',
                 message: 'The operation is going to take a little longer. The view will be updated on completion.'
             });
         }
         else {
+
             Dashboard.alert({
                 title: Globalize.translate('AutoOrganizeError'),
-                message: Globalize.translate('ErrorOrganizingFileWithErrorCode', e.getResponseHeader("X-Application-Error-Code"))
+                message: Globalize.translate('ErrorOrganizingFileWithErrorCode', e.headers.get('X-Application-Error-Code'))
             });
         }
     }
@@ -318,10 +317,9 @@
             ApiClient.clearOrganizationLog().then(function () {
                 reloadItems(page);
             }, onApiFailure);
-
         });
 
-    }).on('pageshow', "#libraryFileOrganizerLogPage", function () {
+    }).on('pageshow', '#libraryFileOrganizerLogPage', function () {
 
         LibraryMenu.setTabs('autoorganize', 0, getTabs);
 
@@ -337,9 +335,9 @@
             taskKey: 'AutoOrganize'
         });
 
-        Events.on(ApiClient, "websocketmessage", onWebSocketMessage);
+        Events.on(ApiClient, 'websocketmessage', onWebSocketMessage);
 
-    }).on('pagebeforehide', "#libraryFileOrganizerLogPage", function () {
+    }).on('pagebeforehide', '#libraryFileOrganizerLogPage', function () {
 
         var page = this;
 
@@ -350,7 +348,7 @@
             mode: 'off'
         });
 
-        Events.off(ApiClient, "websocketmessage", onWebSocketMessage);
+        Events.off(ApiClient, 'websocketmessage', onWebSocketMessage);
     });
 
-});
+});
\ No newline at end of file