Probably should add an Assert.notNull here