[F] Throw Error instead of class with name property
[F] Minor template fixes