diff --git a/CHANGES.md b/CHANGES.md
index 9f5d484f..26a1123c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@
 * Fix provider SCC handle null server responses
 * Change provider SCC remove 1 of 3 requests per search to save 30% time
 * Change provider Womble's use SSL
+* Fix getManualSearchStatus: object has no attribute 'segment'
 
 
 ### 0.9.1 (2015-05-25 03:03:00 UTC)
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index c7d6739b..efa0ece2 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -1810,7 +1810,7 @@ class Home(MainHandler):
                                      'searchstatus' : searchstatus,
                                      'status' : statusStrings[searchThread.segment.status],
                                      'quality': self.getQualityClass(searchThread.segment)})
-                else:
+                elif hasattr(searchThread, 'segment'):
                     for epObj in searchThread.segment:
                         episodes.append({'episode': epObj.episode,
                              'episodeindexid': epObj.indexerid,
@@ -1833,7 +1833,7 @@ class Home(MainHandler):
                                  'searchstatus' : searchstatus,
                                  'status' : statusStrings[searchThread.segment.status],
                                  'quality': self.getQualityClass(searchThread.segment)})
-            else:
+            elif hasattr(searchThread, 'segment'):
                 for epObj in searchThread.segment:
                     episodes.append({'episode': epObj.episode,
                                      'episodeindexid': epObj.indexerid,
@@ -1853,18 +1853,17 @@ class Home(MainHandler):
                                  'searchstatus' : searchstatus,
                                  'status' : statusStrings[searchThread.segment.status],
                                  'quality': self.getQualityClass(searchThread.segment)})
-                else:
-                    ### These are only Failed Downloads/Retry SearchThreadItems.. lets loop through the segement/episodes
-                    if str(searchThread.show.indexerid) == show:
-                        for epObj in searchThread.segment:
-                            if not [x for x in episodes if x['episodeindexid'] == epObj.indexerid]:
-                                searchstatus = 'finished'
-                                episodes.append({'episode': epObj.episode,
-                                                 'episodeindexid': epObj.indexerid,
-                                         'season' : epObj.season,
-                                         'searchstatus' : searchstatus,
-                                         'status' : statusStrings[epObj.status],
-                                         'quality': self.getQualityClass(epObj)})
+                ### These are only Failed Downloads/Retry SearchThreadItems.. lets loop through the segement/episodes
+                elif hasattr(searchThread, 'segment') and str(searchThread.show.indexerid) == show:
+                    for epObj in searchThread.segment:
+                        if not [x for x in episodes if x['episodeindexid'] == epObj.indexerid]:
+                            searchstatus = 'finished'
+                            episodes.append({'episode': epObj.episode,
+                                             'episodeindexid': epObj.indexerid,
+                                     'season' : epObj.season,
+                                     'searchstatus' : searchstatus,
+                                     'status' : statusStrings[epObj.status],
+                                     'quality': self.getQualityClass(epObj)})
 
         return json.dumps({'show': show, 'episodes' : episodes})