Error handling even better.