Again, error handling changed.