error handling NOTICE
Merge branch 'develop'