Option 1 - Adding a conditional check