Error handling is much improved