diff --git a/run b/run
index feb8375..c38fc4f 100755
--- a/run
+++ b/run
@@ -399,12 +399,13 @@ def main(args, extra_args=None):
             for line in logfile:
                 if panic_re.search(line):
                     error_string_found = True
-        with open(common.guest_terminal_file, 'br') as logfile:
-            lines = logfile.readlines()
-            if lines:
-                last_line = lines[-1]
-                if last_line.rstrip() == common.magic_fail_string:
-                    error_string_found = True
+        if os.path.exists(common.guest_terminal_file):
+            with open(common.guest_terminal_file, 'br') as logfile:
+                lines = logfile.readlines()
+                if lines:
+                    last_line = lines[-1]
+                    if last_line.rstrip() == common.magic_fail_string:
+                        error_string_found = True
         if error_string_found:
             common.log_error('simulation error detected by parsing logs')
             return 1
diff --git a/run-gdb b/run-gdb
index c6cad13..6b4b16c 100755
--- a/run-gdb
+++ b/run-gdb
@@ -228,7 +228,7 @@ the script is a .py file next to the source code.
 '''
     )
     parser.add_argument(
-        '--userland', default=defaults['userland'],
+        '-u', '--userland', default=defaults['userland'],
     )
     parser.add_argument(
         'break_at', nargs='?',