Starting to add new error handling