improved arg checking and performance
Merge pull request #161 from igal-getrailo/jira-2391

improved arg checking and performance