Null checks, db update