Yes, thanks for spotting! Have rewritten it pretty much like this now. It doesn't need the `assertNotNull` as a constructor can never return null.