diff --git a/MeshLib/Elements/TemplateHex.tpp b/MeshLib/Elements/TemplateHex.tpp
index e416b5c444175c93ddf9a28b03ea412aef875a66..9388ac7f2ae0df82b021fb6f636ec5f1af00b8d2 100644
--- a/MeshLib/Elements/TemplateHex.tpp
+++ b/MeshLib/Elements/TemplateHex.tpp
@@ -163,12 +163,12 @@ ElementErrorCode TemplateHex<NNODES,CELLHEXTYPE>::isValid() const
 		
 	for (unsigned i=0; i<6; ++i)
 	{
-		if (!error_code.all())
-		{
-			const MeshLib::Element* quad (this->getFace(i));
-			error_code |= quad->isValid();
-			delete quad;
-		}
+		if (error_code.all())
+			break
+
+		const MeshLib::Element* quad (this->getFace(i));
+		error_code |= quad->isValid();
+		delete quad;
 	}
 	return error_code;
 }