diff --git a/NzbDrone.Core/DecisionEngine/Specifications/NotSampleSpecification.cs b/NzbDrone.Core/DecisionEngine/Specifications/NotSampleSpecification.cs
new file mode 100644
index 000000000..afcb7149a
--- /dev/null
+++ b/NzbDrone.Core/DecisionEngine/Specifications/NotSampleSpecification.cs
@@ -0,0 +1,20 @@
+using NzbDrone.Core.IndexerSearch.Definitions;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.DecisionEngine.Specifications
+{
+    public class NotSampleSpecification : IDecisionEngineSpecification
+    {
+        public string RejectionReason { get { return "Sample"; } }
+
+        public bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
+        {
+            if (subject.Release.Title.ToLower().Contains("sample") && subject.Release.Size < 70.Megabytes())
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index 81f072eb4..dae681ba9 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -188,6 +188,7 @@
     <Compile Include="DecisionEngine\IDecisionEngineSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\CutoffSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\NotRestrictedReleaseSpecification.cs" />
+    <Compile Include="DecisionEngine\Specifications\NotSampleSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\RssSync\ProperSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\Search\SeasonMatchSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\Search\DailyEpisodeMatchSpecification.cs" />
diff --git a/NzbDrone.Core/Update/UpdateCheckService.cs b/NzbDrone.Core/Update/UpdateCheckService.cs
index a357fde2f..32cb64be2 100644
--- a/NzbDrone.Core/Update/UpdateCheckService.cs
+++ b/NzbDrone.Core/Update/UpdateCheckService.cs
@@ -34,7 +34,6 @@ namespace NzbDrone.Core.Update
             if (latestAvailable == null)
             {
                 _logger.ProgressDebug("No update available.");
-                return null;
             }
 
             return latestAvailable;
diff --git a/UI/Handlebars/Helpers/Html.js b/UI/Handlebars/Helpers/Html.js
index 55bd4b893..9c5556c0f 100644
--- a/UI/Handlebars/Helpers/Html.js
+++ b/UI/Handlebars/Helpers/Html.js
@@ -11,6 +11,7 @@ define(
             if (!img.src.contains(placeHolder)) {
                 img.src = placeHolder;
             }
+            img.onerror = null;
         };
 
         Handlebars.registerHelper('defaultImg', function () {