Added a bunch of not null contracts.