Working on error handling
Doc update