Add guard (11/25)

Add guard