diff --git a/CHANGES.md b/CHANGES.md
index ccaf846e..1e5de442 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -155,6 +155,7 @@
 * Change reduce number of DB calls for extra_info_no_name
 * Add parse repack, proper level to recent search flow
 * Change reenable Trakt Notifier to update collections at end of PP
+* Fix NotifierFactory attribute enabled_ondownloadsubtitles should be enabled_onsubtitlesdownload
 
 
 ### 0.12.37 (2017-11-12 10:35:00 UTC)
diff --git a/sickbeard/notifiers/__init__.py b/sickbeard/notifiers/__init__.py
index 02b67696..1ff173c1 100644
--- a/sickbeard/notifiers/__init__.py
+++ b/sickbeard/notifiers/__init__.py
@@ -143,7 +143,7 @@ def notify_download(ep_name):
 
 
 def notify_subtitle_download(ep_name, lang):
-    for n in NotifierFactory().get_enabled('ondownloadsubtitles'):
+    for n in NotifierFactory().get_enabled('onsubtitledownload'):
         n.notify_subtitle_download(ep_name, lang)
 
 
diff --git a/sickbeard/tv.py b/sickbeard/tv.py
index 46fa74a1..1f966243 100644
--- a/sickbeard/tv.py
+++ b/sickbeard/tv.py
@@ -1682,7 +1682,12 @@ class TVEpisode(object):
         newsubtitles = set(self.subtitles).difference(set(previous_subtitles))
 
         if newsubtitles:
-            subtitleList = ", ".join(subliminal.language.Language(x).name for x in newsubtitles)
+            try:
+                subtitleList = ", ".join(subliminal.language.Language(x).name for x in newsubtitles)
+            except(StandardError, Exception):
+                logger.log('Could not parse a language to use to fetch subtitles for episode %sx%s' %
+                           (self.season, self.episode), logger.DEBUG)
+                return
             logger.log('%s: Downloaded %s subtitles for episode %sx%s' %
                        (self.show.indexerid, subtitleList, self.season, self.episode), logger.DEBUG)