Do not check against hardcoded value
Better error message
Remove always set $conditional_class variable