Merge pull request #1084 from otamachan/lunar-devel-patch

[roslaunch] Fix pid file removing condition

tools/roslaunch/src/roslaunch/__init__.py

@@ -324,7 +324,7 @@ def main(argv=sys.argv):
         sys.exit(1)
     finally:
         # remove the pid file
-        if options.pid_fn:
+        if options is not None and options.pid_fn:
             try: os.unlink(options.pid_fn)
             except os.error: pass