faster: improved error handling.