fixup! fixup! better error messages