add errors/error handling