diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 28f09d76..56a9b5a7 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -333,9 +333,9 @@ def main(args):
                                 (os.path.basename(dir_name)))
                     core.DOWNLOAD_INFO = core.get_download_info(os.path.basename(dir_name), 0)
                     if core.DOWNLOAD_INFO:
-                        client_agent = text_type(core.DOWNLOAD_INFO[0].get('client_agent', 'manual'))
-                        input_hash = text_type(core.DOWNLOAD_INFO[0].get('input_hash', ''))
-                        input_id = text_type(core.DOWNLOAD_INFO[0].get('input_id', ''))
+                        client_agent = text_type(core.DOWNLOAD_INFO[0]['client_agent']) or 'manual'
+                        input_hash = text_type(core.DOWNLOAD_INFO[0]['input_hash']) or ''
+                        input_id = text_type(core.DOWNLOAD_INFO[0]['input_id']) or ''
                         logger.info('Found download info for {0}, '
                                     'setting variables now ...'.format(os.path.basename(dir_name)))
                     else:
diff --git a/libs/custom/syno/auth.py b/libs/custom/syno/auth.py
index ef8d2f8e..fb3a4927 100644
--- a/libs/custom/syno/auth.py
+++ b/libs/custom/syno/auth.py
@@ -97,7 +97,7 @@ class Authentication:
 
         req_param['_sid'] = self._sid
 
-        if method is 'get':
+        if method == 'get':
             url = ('%s%s' % (self._base_url, api_path)) + '?api=' + api_name
             response = requests.get(url, req_param)
 
@@ -106,7 +106,7 @@ class Authentication:
             else:
                 return response
 
-        elif method is 'post':
+        elif method == 'post':
             url = ('%s%s' % (self._base_url, api_path)) + '?api=' + api_name
             response = requests.post(url, req_param)
 
@@ -121,4 +121,4 @@ class Authentication:
 
     @property
     def base_url(self):
-        return self._base_url
\ No newline at end of file
+        return self._base_url
diff --git a/nzbToMedia.py b/nzbToMedia.py
index 485b2279..0cc0b796 100755
--- a/nzbToMedia.py
+++ b/nzbToMedia.py
@@ -1016,8 +1016,8 @@ def main(args, section=None):
                         logger.info('Found download info for {0}, '
                                     'setting variables now ...'.format
                                     (os.path.basename(dir_name)))
-                        client_agent = text_type(core.DOWNLOAD_INFO[0].get('client_agent', 'manual'))
-                        download_id = text_type(core.DOWNLOAD_INFO[0].get('input_id', ''))
+                        client_agent = text_type(core.DOWNLOAD_INFO[0]['client_agent']) or 'manual'
+                        download_id = text_type(core.DOWNLOAD_INFO[0]['input_id']) or ''
                     else:
                         logger.info('Unable to locate download info for {0}, '
                                     'continuing to try and process this release ...'.format