add errors code
Merge branch 'testing'