Use a guard instead of having the whole thing indented in boot