Yes, macular edema may be present with non-proliferative diabetic retinopathy in the mild, moderate, or severe versions.