Bug #1370666

Handle undefined error
Merge pull request #101 from surakula/master

Bug #1370666
Merge pull request #102 from Juniper/master

Merge branch 'master' to R1.10