Fixed 2 Errors that were caused by UNSET variables
Merge pull request #186 from codedmaster/master

Fixed 2 Errors that were caused by UNSET variables