Data maybe '' or 0 - ensure data is None