diff --git a/NzbDrone.Core/Providers/NewznabProvider.cs b/NzbDrone.Core/Providers/NewznabProvider.cs
index f18cc8d0e..ad9b8e53d 100644
--- a/NzbDrone.Core/Providers/NewznabProvider.cs
+++ b/NzbDrone.Core/Providers/NewznabProvider.cs
@@ -74,6 +74,12 @@ namespace NzbDrone.Core.Providers
             {
                 var currentIndexers = All();
 
+                Logger.Debug("Deleting broken Newznab indexer");
+                var brokenIndexers = currentIndexers.Where(i => String.IsNullOrEmpty(i.Name) || String.IsNullOrWhiteSpace(i.Url)).ToList();
+                brokenIndexers.ForEach(e => _database.Delete<NewznabDefinition>(e.Id));
+
+                currentIndexers = All();
+
                 foreach(var feedProvider in indexers)
                 {
                     try
diff --git a/NzbDrone.Core/Repository/NewznabDefinition.cs b/NzbDrone.Core/Repository/NewznabDefinition.cs
index 3e658d902..8e0d5460c 100644
--- a/NzbDrone.Core/Repository/NewznabDefinition.cs
+++ b/NzbDrone.Core/Repository/NewznabDefinition.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.DataAnnotations;
 using PetaPoco;
 
 namespace NzbDrone.Core.Repository
@@ -11,8 +12,10 @@ namespace NzbDrone.Core.Repository
 
         public Boolean Enable { get; set; }
 
+        [DisplayFormat(ConvertEmptyStringToNull = false)]
         public String Name { get; set; }
 
+        [DisplayFormat(ConvertEmptyStringToNull = false)]
         public String Url { get; set; }
 
         public String ApiKey { get; set; }