Replace !== null with ! empty