diff --git a/lldb/test/functionalities/command_script/welcome.py b/lldb/test/functionalities/command_script/welcome.py
index f7e6a7ebc744..c6d4ddcfd40d 100644
--- a/lldb/test/functionalities/command_script/welcome.py
+++ b/lldb/test/functionalities/command_script/welcome.py
@@ -16,15 +16,11 @@ class TargetnameCommand(object):
         pass
 
     def __call__(self, debugger, args, exe_ctx, result):
-        if args == 'fail':
-            result.SetError('a test for error in command')
-            return
         target = debugger.GetSelectedTarget()
         file = target.GetExecutable()
-        if file:
-            print >>result,  ('Current target ' + file.GetFilename())
-        else:
-            result.SetError('target.GetExecutable() failed')
+        print >>result,  ('Current target ' + file.GetFilename())
+        if args == 'fail':
+            result.SetError('a test for error in command')
     
     def get_flags(self):
         return lldb.eCommandRequiresTarget