diff --git a/gui/slick/interfaces/default/displayShow.tmpl b/gui/slick/interfaces/default/displayShow.tmpl
index e7be985cfaec2a330c0b0504ef8f446942914324..c6638d170832d8b1d56813cbeb6b894419d1c70e 100644
--- a/gui/slick/interfaces/default/displayShow.tmpl
+++ b/gui/slick/interfaces/default/displayShow.tmpl
@@ -284,7 +284,7 @@
                 </table>
             
                 <table style="width:180px; float: right; vertical-align: middle; height: 100%;">
-                    #set $info_flag = $subtitles.fromietf($show.lang).opensubtitles
+                    #set $info_flag = $subtitles.fromietf($show.lang).opensubtitles if $show.lang else ''
                     <tr><td class="showLegend">Info Language:</td><td><img src="$sbRoot/images/subtitles/flags/${info_flag}.png" width="16" height="11" alt="$show.lang" title="$show.lang" onError="this.onerror=null;this.src='$sbRoot/images/flags/unknown.png';"/></td></tr>
                     #if $sickbeard.USE_SUBTITLES
                     <tr><td class="showLegend">Subtitles: </td><td><img src="$sbRoot/images/#if $show.subtitles then "yes16.png\" alt=\"Y" else "no16.png\" alt=\"N"#" width="16" height="16" /></td></tr>
diff --git a/sickbeard/clients/__init__.py b/sickbeard/clients/__init__.py
index fa11a8ce03e84361b47aa7b31dfef72ad33011cc..38c67c71e15cc933bdb010d8be82259d9423052a 100644
--- a/sickbeard/clients/__init__.py
+++ b/sickbeard/clients/__init__.py
@@ -111,7 +111,7 @@ def getClientModule(name):
     name = name.lower()
     prefix = "sickbeard.clients."
 
-    return __import__(prefix + name, fromlist=__all__)
+    return __import__(prefix + name + '_client', fromlist=__all__)
 
 
 def getClientIstance(name):
diff --git a/sickbeard/clients/deluge.py b/sickbeard/clients/deluge_client.py
similarity index 99%
rename from sickbeard/clients/deluge.py
rename to sickbeard/clients/deluge_client.py
index 48282a5070aaeeb1dd34538355074f7f91921312..3303ce896fd5cfe5ef4b08da2806e60a98bc0e3d 100644
--- a/sickbeard/clients/deluge.py
+++ b/sickbeard/clients/deluge_client.py
@@ -21,7 +21,7 @@ from base64 import b64encode
 
 import sickbeard
 from sickbeard import logger
-from sickbeard.clients.generic import GenericClient
+from .generic import GenericClient
 
 
 class DelugeAPI(GenericClient):
@@ -217,4 +217,4 @@ class DelugeAPI(GenericClient):
         return True
 
 
-api = DelugeAPI()
\ No newline at end of file
+api = DelugeAPI()
diff --git a/sickbeard/clients/download_station.py b/sickbeard/clients/download_station_client.py
similarity index 97%
rename from sickbeard/clients/download_station.py
rename to sickbeard/clients/download_station_client.py
index 25dc9fceb9df4afaf2cd82dd8c65dcd72a2a72b1..bbbd4e86f508443372ca1fed5b9cdabb18a42f77 100644
--- a/sickbeard/clients/download_station.py
+++ b/sickbeard/clients/download_station_client.py
@@ -21,7 +21,7 @@
 # Uses the Synology Download Station API: http://download.synology.com/download/Document/DeveloperGuide/Synology_Download_Station_Web_API.pdf
 
 import sickbeard
-from sickbeard.clients.generic import GenericClient
+from .generic import GenericClient
 
 class DownloadStationAPI(GenericClient):
 
@@ -72,4 +72,4 @@ class DownloadStationAPI(GenericClient):
 
         return self.response.json()['success']
 
-api = DownloadStationAPI()
\ No newline at end of file
+api = DownloadStationAPI()
diff --git a/sickbeard/clients/generic.py b/sickbeard/clients/generic.py
index a0a07132f674a2e82212ace044b767b9f535b70b..22bbf1ff7eb174ba0c21e9755d2b03dec2bd2463 100644
--- a/sickbeard/clients/generic.py
+++ b/sickbeard/clients/generic.py
@@ -6,7 +6,7 @@ from base64 import b16encode, b32decode
 import sickbeard
 from sickbeard import logger
 from sickbeard.exceptions import ex
-from sickbeard.clients import http_error_code
+from . import http_error_code
 from bencode import bencode, bdecode
 import requests
 from requests import exceptions
diff --git a/sickbeard/clients/qbittorrent.py b/sickbeard/clients/qbittorrent_client.py
similarity index 96%
rename from sickbeard/clients/qbittorrent.py
rename to sickbeard/clients/qbittorrent_client.py
index d53d31f4fd33e6353881fb7ab83b8568f13a62f6..b07d827b320bb902fcbc53c3fc985b1ceb7e294e 100644
--- a/sickbeard/clients/qbittorrent.py
+++ b/sickbeard/clients/qbittorrent_client.py
@@ -18,7 +18,7 @@
 
 import sickbeard
 from sickbeard import logger
-from sickbeard.clients.generic import GenericClient
+from .generic import GenericClient
 import requests
 from requests.auth import HTTPDigestAuth
 
@@ -70,4 +70,4 @@ class qbittorrentAPI(GenericClient):
         data = {'hash': result.hash}
         return self._request(method='post', data=data)
 
-api = qbittorrentAPI()
\ No newline at end of file
+api = qbittorrentAPI()
diff --git a/sickbeard/clients/rtorrent.py b/sickbeard/clients/rtorrent_client.py
similarity index 99%
rename from sickbeard/clients/rtorrent.py
rename to sickbeard/clients/rtorrent_client.py
index 962b48ff2f77ec4fed98298c6e7ed68c583c60cd..2b2ee37c7a020ce4a928c22f72a004cff0ed20c5 100644
--- a/sickbeard/clients/rtorrent.py
+++ b/sickbeard/clients/rtorrent_client.py
@@ -21,7 +21,7 @@ import traceback
 
 import sickbeard
 from sickbeard import logger
-from sickbeard.clients.generic import GenericClient
+from .generic import GenericClient
 from rtorrent import RTorrent
 from rtorrent.err import MethodError
 
diff --git a/sickbeard/clients/transmission.py b/sickbeard/clients/transmission_client.py
similarity index 99%
rename from sickbeard/clients/transmission.py
rename to sickbeard/clients/transmission_client.py
index f0d20124a5200ffd704e26f4d921e0e6ac48d1c6..ebc11dc65e22199ce26b02008bdfcf3d986f09d1 100644
--- a/sickbeard/clients/transmission.py
+++ b/sickbeard/clients/transmission_client.py
@@ -22,7 +22,7 @@ from base64 import b64encode
 
 import sickbeard
 from sickbeard import logger
-from sickbeard.clients.generic import GenericClient
+from .generic import GenericClient
 
 
 class TransmissionAPI(GenericClient):
diff --git a/sickbeard/clients/utorrent.py b/sickbeard/clients/utorrent_client.py
similarity index 98%
rename from sickbeard/clients/utorrent.py
rename to sickbeard/clients/utorrent_client.py
index 58b4e0298e099854719889b8d208035823c71250..c19161a5d44a405edeabfb218ec64981bc6235fc 100644
--- a/sickbeard/clients/utorrent.py
+++ b/sickbeard/clients/utorrent_client.py
@@ -20,7 +20,7 @@ import re
 
 import sickbeard
 from sickbeard import logger
-from sickbeard.clients.generic import GenericClient
+from .generic import GenericClient
 
 
 class uTorrentAPI(GenericClient):
diff --git a/sickbeard/tv.py b/sickbeard/tv.py
index eba5316065f1f35a247c8835cbc7f8f5c980f7f6..d00e8ddbd62823e3aebd20eecc7d0bd356026820 100644
--- a/sickbeard/tv.py
+++ b/sickbeard/tv.py
@@ -1788,7 +1788,7 @@ class TVEpisode(object):
 
             # if it hasn't aired yet set the status to UNAIRED
             if self.airdate >= datetime.date.today() and self.status in [SKIPPED, UNAIRED, UNKNOWN, WANTED]:
-                logger.log(u"Episode airs in the future, marking it " + str(UNAIRED), logger.DEBUG)
+                logger.log(u"Episode airs in the future, marking it UNAIRED", logger.DEBUG)
                 self.status = UNAIRED
 
             # if there's no airdate then set it to skipped (and respect ignored)
@@ -1796,8 +1796,8 @@ class TVEpisode(object):
                 if self.status == IGNORED:
                     logger.log(u"Episode has no air date, but it's already marked as ignored", logger.DEBUG)
                 else:
-                    logger.log(u"Episode has no air date, automatically marking it skipped", logger.DEBUG)
-                    self.status = SKIPPED
+                    logger.log(u"Episode has no air date, automatically marking it unaired", logger.DEBUG)
+                    self.status = UNAIRED
 
             # if we don't have the file and the airdate is in the past
             else: