I am making more updates to error handling