Handling errors better.