Merge "If setup fails, hang forever"