Fix empty to NULL