--- a/cmd2.py	Thu Dec 20 13:48:56 2007 -0500
+++ b/cmd2.py	Fri Dec 21 10:04:26 2007 -0500
@@ -231,15 +231,16 @@
         except IOError, e:
             try:
                 self.stdin = open('%s.%s' % (fname, self.defaultExtension), 'r')
-		self.use_rawinput = False
-		self.prompt = self.continuationPrompt = ''
-		self.cmdloop()
-		self.stdin.close()
-		self.lastcmd = ''		
-            except IOError:
+	    except IOError:
                 print 'Problem opening file %s: \n%s' % (fname, e)
-        finally:	
-	    keepstate.restore()
+		keepstate.restore()
+		return
+	self.use_rawinput = False
+	self.prompt = self.continuationPrompt = ''
+	self.cmdloop()
+	self.stdin.close()
+	keepstate.restore()
+	self.lastcmd = ''
 	    
 class HistoryItem(str):
     def __init__(self, instr):