Added empty checks for NDC and Marker fields