Added not null clauses
refs #542