removal of custom errors
Merge branch 'clean'
robust custom errors