Fix the way we handle empty launches a bit