diff --git a/NzbDrone.Web/Controllers/SettingsController.cs b/NzbDrone.Web/Controllers/SettingsController.cs
index 34d17175a..8a6c22f34 100644
--- a/NzbDrone.Web/Controllers/SettingsController.cs
+++ b/NzbDrone.Web/Controllers/SettingsController.cs
@@ -307,7 +307,6 @@ namespace NzbDrone.Web.Controllers
             return new JsonResult { Data = "ok" };
         }
 
-
         public QualityModel GetUpdatedProfileList()
         {
             var profiles = _qualityProvider.All().ToList();
@@ -323,7 +322,16 @@ namespace NzbDrone.Web.Controllers
             try
             {
                 var info = _autoConfigureProvider.AutoConfigureSab();
-                return Json(info, JsonRequestBehavior.AllowGet);
+
+                if (info != null)
+                    return Json(info, JsonRequestBehavior.AllowGet);
+
+                return Json(new NotificationResult
+                                {
+                                        Title = "Auto-Configure Failed",
+                                        Text = "Please enter your SAB Settings Manually",
+                                        NotificationType = NotificationType.Error
+                                }, JsonRequestBehavior.AllowGet);
             }
 
             catch (Exception)
diff --git a/NzbDrone.Web/Views/Settings/Index.cshtml b/NzbDrone.Web/Views/Settings/Index.cshtml
index 81a91dd41..e7e51643d 100644
--- a/NzbDrone.Web/Views/Settings/Index.cshtml
+++ b/NzbDrone.Web/Views/Settings/Index.cshtml
@@ -12,4 +12,4 @@ Settings
         <li>@Html.ActionLink("Notifications", "Notifications", "Settings")</li>
         <li>@Html.ActionLink("System", "System", "Settings")</li>
     </ul>
-</div>
+</div>
\ No newline at end of file