! Make sure variables are defined before using them (fixes #2301)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #2309 from Oldiesmann/release-2.1

! Make sure variables are defined before using them (fixes #2301)