Add a guard on start