diff --git a/ICSharpCode.Decompiler/IL/Instructions/BinaryNumericInstruction.cs b/ICSharpCode.Decompiler/IL/Instructions/BinaryNumericInstruction.cs
index 02dc4d478..48a980c6b 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/BinaryNumericInstruction.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/BinaryNumericInstruction.cs
@@ -109,7 +109,7 @@ namespace ICSharpCode.Decompiler.IL
 		
 		public override InstructionFlags DirectFlags {
 			get {
-				if (Operator == BinaryNumericOperator.Div || Operator == BinaryNumericOperator.Rem)
+				if (CheckForOverflow || (Operator == BinaryNumericOperator.Div || Operator == BinaryNumericOperator.Rem))
 					return base.DirectFlags | InstructionFlags.MayThrow;
 				return base.DirectFlags;
 			}
diff --git a/ICSharpCode.Decompiler/IL/Instructions/CompoundAssignmentInstruction.cs b/ICSharpCode.Decompiler/IL/Instructions/CompoundAssignmentInstruction.cs
index ca9a3ac89..541c56892 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/CompoundAssignmentInstruction.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/CompoundAssignmentInstruction.cs
@@ -91,7 +91,7 @@ namespace ICSharpCode.Decompiler.IL
 		public override InstructionFlags DirectFlags {
 			get {
 				var flags = InstructionFlags.SideEffect;
-				if (Operator == BinaryNumericOperator.Div || Operator == BinaryNumericOperator.Rem)
+				if (CheckForOverflow || (Operator == BinaryNumericOperator.Div || Operator == BinaryNumericOperator.Rem))
 					flags |= InstructionFlags.MayThrow;
 				return flags;
 			}