Add ENV variable guards