The impact of mask CD non-uniformity on the accuracy of optical proximity correction (OPC) models has been observed on several critical levels. In the current OPC model calibration flow, the mask effect is not explicitly separated from the optical and resist models. Instead, the resist model is compensating for the mask errors. In this paper, we report a detailed study of the effect of mask CD non-uniformity on OPC model accuracy using the established OPC model calibration flow. The influence of mask CD non-uniformity on the through process behavior of an OPC model is also discussed. A possible OPC flow to take the systematic mask CD error into consideration is proposed and a detailed study of mask modeling is present.