Merge branch 'madhusudancs/error-reporting'