--- a/cmd2.py	Mon Nov 17 14:32:18 2008 -0500
+++ b/cmd2.py	Tue Nov 18 13:12:43 2008 -0500
@@ -313,14 +313,14 @@
         statekeeper = None
         stop = 0
         if statement.input:
-            if statement.inputFrom:
-                try:
+            try:
+                if statement.inputFrom:
                     newinput = open(statement.inputFrom, 'r').read()
-                except OSError, e:
-                    print e
-                    return 0
-            else:
-                newinput = getPasteBuffer()
+                else:
+                    newinput = getPasteBuffer()
+            except (OSError,), e:
+                print e
+                return 0                    
             start, end = self.redirectInPattern.scanString(statement.fullStatement).next()[1:]
             return self.onecmd('%s%s%s' % (statement.fullStatement[:start], 
                                 newinput, statement.fullStatement[end:]))