Added a guard clause