ADDED: null check in dba