Fix startup exception (finally?)