Added guarding

Currently only aesthetic