Issue #1960902 by samhassell: Verify existing variables exist before using them.