diff --git a/data/interfaces/default/config_general.tmpl b/data/interfaces/default/config_general.tmpl
index f633cc9868381a29aeb735f530704d153e2ff201..ed53690ab9bcc1ec588f153c3d21d0dabfe30cc2 100644
--- a/data/interfaces/default/config_general.tmpl
+++ b/data/interfaces/default/config_general.tmpl
@@ -160,7 +160,7 @@ nameTestURL = "$sbRoot/config/general/testNaming";
                             <input type="checkbox" name="use_banner" id="use_banner" #if $sickbeard.USE_BANNER then "CHECKED" else ""#>
                             <label class="clearfix" for="use_banner">
                                 <span class="component-title">Use Banners</span>
-                                <span class="component-desc">Use banners instead of posters for your show folder images</span>
+                                <span class="component-desc">Use banners instead of posters for your Show Folder Images</span>
                             </label>
                         </div>
 
diff --git a/sickbeard/metadata/xbmc.py b/sickbeard/metadata/xbmc.py
index 9444d33b70f7de53466f27e4e5142181eead1c0c..4a786d29e11bc0f8ab7f3bb77c92ec04f0b1e4e2 100644
--- a/sickbeard/metadata/xbmc.py
+++ b/sickbeard/metadata/xbmc.py
@@ -195,10 +195,11 @@ class XBMCMetadata(generic.GenericMetadata):
                 logger.log(u"Unable to find episode " + str(curEpToWrite.season) + "x" + str(curEpToWrite.episode) + " on tvdb... has it been removed? Should I delete from db?")
                 return None
 
-            if myEp["firstaired"] == None and ep_obj.season == 0:
+            if not myEp["firstaired"]:
                 myEp["firstaired"] = str(datetime.date.fromordinal(1))
 
-            if myEp["episodename"] == None or myEp["firstaired"] == None:
+            if not myEp["episodename"]:
+                logger.log(u"Not generating nfo because the ep has no title", logger.DEBUG)
                 return None
 
             logger.log(u"Creating metadata for episode "+str(ep_obj.season)+"x"+str(ep_obj.episode), logger.DEBUG)