diff --git a/Rendering/OpenGL/vtkPrimitivePainter.cxx b/Rendering/OpenGL/vtkPrimitivePainter.cxx
index f58ed1fbb7685f542c7b3eb9f9f788a7532d7b45..06809b1cb19fdb8b3bd29e0cd45573be19e7c366 100644
--- a/Rendering/OpenGL/vtkPrimitivePainter.cxx
+++ b/Rendering/OpenGL/vtkPrimitivePainter.cxx
@@ -268,18 +268,15 @@ void vtkPrimitivePainter::RenderInternal(vtkRenderer* renderer,
 
   // Edge flag
   ef = input->GetPointData()->GetAttribute(vtkDataSetAttributes::EDGEFLAG);
-  if (ef)
+  if (ef && ef->GetNumberOfComponents() != 1)
     {
-    if (ef->GetNumberOfComponents() != 1)
-      {
-      vtkDebugMacro(<< "Currently only 1d edge flags are supported.");
-      ef = NULL;
-      }
-    if (!ef->IsA("vtkUnsignedCharArray"))
-      {
-      vtkDebugMacro(<< "Currently only unsigned char edge flags are suported.");
-      ef = NULL;
-      }
+    vtkDebugMacro(<< "Currently only 1d edge flags are supported.");
+    ef = NULL;
+    }
+  if (ef && !ef->IsA("vtkUnsignedCharArray"))
+    {
+    vtkDebugMacro(<< "Currently only unsigned char edge flags are suported.");
+    ef = NULL;
     }
 
   // Set the flags