Refactored the guard for non-existing options