Do the 'errors' workaround more cleanly.