Improve error handling; remove names.