Once we move over and have a Spring dependency we can use Assert.notNull(..), but in the meantime, maybe these should be IllegalArgumentExceptions instead of NPE (once using Assert they would be).