diff --git a/src/Sema.zig b/src/Sema.zig
index d697ab0a9958fea7647be7e20d9e1385ce063be8..12851cc9add831e94fc3fea67618a266c251bac6 100644
--- a/src/Sema.zig
+++ b/src/Sema.zig
@@ -10441,7 +10441,7 @@ fn zirShr(
                 // Detect if any ones would be shifted out.
                 const truncated = try lhs_val.intTruncBitsAsValue(lhs_ty, sema.arena, .unsigned, rhs_val, target);
                 if (!(try truncated.compareWithZeroAdvanced(.eq, sema.kit(block, src)))) {
-                    return sema.addConstUndef(lhs_ty);
+                    return sema.fail(block, src, "exact shift shifted out 1 bits", .{});
                 }
             }
             const val = try lhs_val.shr(rhs_val, lhs_ty, sema.arena, target);
@@ -11346,13 +11346,19 @@ fn zirDivExact(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Ai
         if (maybe_lhs_val) |lhs_val| {
             if (maybe_rhs_val) |rhs_val| {
                 if (is_int) {
-                    // TODO: emit compile error if there is a remainder
+                    const modulus_val = try lhs_val.intMod(rhs_val, resolved_type, sema.arena, target);
+                    if (modulus_val.compareWithZero(.neq)) {
+                        return sema.fail(block, src, "exact division produced remainder", .{});
+                    }
                     return sema.addConstant(
                         resolved_type,
                         try lhs_val.intDiv(rhs_val, resolved_type, sema.arena, target),
                     );
                 } else {
-                    // TODO: emit compile error if there is a remainder
+                    const modulus_val = try lhs_val.floatMod(rhs_val, resolved_type, sema.arena, target);
+                    if (modulus_val.compareWithZero(.neq)) {
+                        return sema.fail(block, src, "exact division produced remainder", .{});
+                    }
                     return sema.addConstant(
                         resolved_type,
                         try lhs_val.floatDiv(rhs_val, resolved_type, sema.arena, target),
diff --git a/test/cases/compile_errors/exact division failure.zig b/test/cases/compile_errors/exact division failure.zig
new file mode 100644
index 0000000000000000000000000000000000000000..d134e0e2fbabd3fe38886a1e97c5a8835903fd1e
--- /dev/null
+++ b/test/cases/compile_errors/exact division failure.zig	
@@ -0,0 +1,10 @@
+comptime {
+    const x = @divExact(10, 3);
+    _ = x;
+}
+
+// error
+// backend=llvm
+// target=native
+//
+// :2:15: error: exact division produced remainder
diff --git a/test/cases/compile_errors/float exact division failure.zig b/test/cases/compile_errors/float exact division failure.zig
new file mode 100644
index 0000000000000000000000000000000000000000..c09defc56ebf72c04ed24248fcc45a5143534087
--- /dev/null
+++ b/test/cases/compile_errors/float exact division failure.zig	
@@ -0,0 +1,10 @@
+comptime {
+    const x = @divExact(10.0, 3.0);
+    _ = x;
+}
+
+// error
+// backend=llvm
+// target=native
+//
+// :2:15: error: exact division produced remainder
diff --git a/test/cases/compile_errors/shrExact_shifts_out_1_bits.zig b/test/cases/compile_errors/shrExact_shifts_out_1_bits.zig
new file mode 100644
index 0000000000000000000000000000000000000000..dd23c4bcb3f68258fc52fe6ad53924900cfe1a1e
--- /dev/null
+++ b/test/cases/compile_errors/shrExact_shifts_out_1_bits.zig
@@ -0,0 +1,10 @@
+comptime {
+    const x = @shrExact(@as(u8, 0b10101010), 2);
+    _ = x;
+}
+
+// error
+// backend=llvm
+// target=native
+//
+// :2:15: error: exact shift shifted out 1 bits
diff --git a/test/cases/compile_errors/stage1/obj/shrExact_shifts_out_1_bits.zig b/test/cases/compile_errors/stage1/obj/shrExact_shifts_out_1_bits.zig
deleted file mode 100644
index 223db7663042f98a32ff416c5e513d806e6e155a..0000000000000000000000000000000000000000
--- a/test/cases/compile_errors/stage1/obj/shrExact_shifts_out_1_bits.zig
+++ /dev/null
@@ -1,10 +0,0 @@
-comptime {
-    const x = @shrExact(@as(u8, 0b10101010), 2);
-    _ = x;
-}
-
-// error
-// backend=stage1
-// target=native
-//
-// tmp.zig:2:15: error: exact shift shifted out 1 bits