v9: Resolving errors