Faster launch as requested by Mark

It is good practice for a method to have only one return path for clarity. In this case, the code can easily be re-factored to have one return type.