@NotNull was triggering some build errors...