Eng 6375 schemachange ddl

Returning null causes other unhappy noises. It's definitely not implying it's okay.