changes in error handling