comment error handling added
Merge branch 'dev'