Not-null checks on migrating data source, now in constructor