Added extra check for undefined variables
Merge pull request #119 from tranek/develop

Added extra check for undefined variables