Replaced DBNull with real null