Can you add a check for the definition of these vars?