update on error handling
error handling