diff --git a/pyren/mod_ddt.py b/pyren/mod_ddt.py
index 27b56d5..b1c2e05 100755
--- a/pyren/mod_ddt.py
+++ b/pyren/mod_ddt.py
@@ -557,6 +557,7 @@ class DDTLauncher():
         self.applySettings()
 
         try:
+            mod_globals.opt_demo = False
             self.elm = ELM(mod_globals.opt_port, mod_globals.opt_speed, mod_globals.opt_log)
         except:
             result = tkMessageBox.askquestion("Warning", "ELM is not connected. Would you like to work OFF-line?", icon='warning')
diff --git a/pyren/mod_elm.py b/pyren/mod_elm.py
index de21807..8fcce3b 100644
--- a/pyren/mod_elm.py
+++ b/pyren/mod_elm.py
@@ -308,7 +308,7 @@ class Port:
             print '*' * 40
             print '*       Connection to ELM was lost'
             mod_globals.opt_demo = True
-            exit (2)
+
         return byte
     
     def write(self, data):
@@ -337,7 +337,6 @@ class Port:
             print '*' * 40
             print '*       Connection to ELM was lost'
             mod_globals.opt_demo = True
-            exit (2)
     
     def expect(self, pattern, time_out=1):
         
diff --git a/pyren/mod_term.py b/pyren/mod_term.py
index f908599..2964d9c 100755
--- a/pyren/mod_term.py
+++ b/pyren/mod_term.py
@@ -831,7 +831,6 @@ def main():
 
     # change serial port baud rate
     if not mod_globals.opt_demo and elm.port and elm.port.portType==0:
-        elm.port.check_elm()
         if mod_globals.opt_speed < mod_globals.opt_rate:
             elm.port.soft_boudrate(mod_globals.opt_rate)
 
@@ -867,7 +866,6 @@ def main():
       else:
         print 'Error: unknown macro name:', auto_macro
 
-
     while True:
         print var['$addr']+':'+var['$txa']+':'+var['$prompt'] + '#',
         if len(cmd_lines)==0: