enhance robustness

ISSUE=IGNORE
TASK=IGNORE
LBID=IGNORE
Merge pull request #6 from leeight/fix-esl

enhance robustness