cleanup variable tracking
Merge pull request #1146 from achamely/master

Check for empty variable, cleanup log message