Handle first start gracefully