Simplified expression based on feedback

Removed explicit nil check