Change to void, add error handling