diff --git a/src/controller/mainController.py b/src/controller/mainController.py
index b5b6be9d..fbbe67bc 100644
--- a/src/controller/mainController.py
+++ b/src/controller/mainController.py
@@ -1247,17 +1247,15 @@ class Controller(object):
  def manage_stream_errors(self, session):
   log.error(" Restarting %s session streams. It will be destroyed" % (session,))
   s = session_.sessions[session]
-  try:
-   if hasattr(s, "main_stream"):
-    self.main_stream.disconnect()
-    log.error("main stream disconnected")
-    del s.main_stream
-   self.timelinesStream.disconnect()
+  if hasattr(s, "main_stream"):
+   s.main_stream.disconnect()
+   log.error("main stream disconnected")
+   del s.main_stream
+  if hasattr(s, "timelinesStream"):
+   s.timelinesStream.disconnect()
    del s.timelinesStream
-   s.counter = 0
-   s.reconnection_function_active = False
-  except AttributeError:
-   log.error("Error deleting some thing")
+  s.counter = 0
+  s.reconnection_function_active = False
 #  for i in self.buffers:
 #   if i.invisible == True and i.session.session_id == s.session_id and i.type != "people":
 #    i.start_stream()
diff --git a/src/sessionmanager/session.py b/src/sessionmanager/session.py
index 95ee27e0..bc1552c5 100644
--- a/src/sessionmanager/session.py
+++ b/src/sessionmanager/session.py
@@ -304,8 +304,10 @@ class Session(object):
  def start_streaming(self):
 
   """ Start the streaming for sending tweets in realtime."""
-  self.get_timelines()
-  self.get_main_stream()
+  if not hasattr(self, "main_stream"):
+   self.get_timelines()
+  if not hasattr(self, "timelinesStream"):
+   self.get_main_stream()
 
  def get_main_stream(self):
   log.debug("Starting the main stream...")
@@ -360,10 +362,10 @@ class Session(object):
   self.reconnection_function_active = False
   if hasattr(self, "timelinesStream") and not hasattr(self.timelinesStream, "friends"):
    self.add_friends()
-  try:
-   urllib2.urlopen("http://74.125.228.231", timeout=5)
-  except urllib2.URLError:
-   pub.sendMessage("stream-error", session=self.session_id)
+#  try:
+#   urllib2.urlopen("http://74.125.228.231", timeout=5)
+#  except urllib2.URLError:
+#   pub.sendMessage("stream-error", session=self.session_id)
 
  def remove_stream(self, stream):
   if stream == "timelinesStream":