diff --git a/build/fq.cpp b/build/fq.cpp
index afdba04..2078fe6 100644
--- a/build/fq.cpp
+++ b/build/fq.cpp
@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <gmp.h>
-#include <assert.h>
 #include <string>
+#include <stdexcept>
 
 
 static mpz_t q;
@@ -162,7 +162,7 @@ void Fq_div(PFqElement r, PFqElement a, PFqElement b) {
 }
 
 void Fq_fail() {
-    assert(false);
+    throw std::runtime_error("Fq error");
 }
 
 void Fq_longErr()
diff --git a/build/fq_generic.cpp b/build/fq_generic.cpp
index 58723ae..f771e20 100755
--- a/build/fq_generic.cpp
+++ b/build/fq_generic.cpp
@@ -1,7 +1,6 @@
 #include "fq.hpp"
 #include <cstdint>
 #include <cstring>
-#include <cassert>
 
 FqElement Fq_q  = {0, 0x80000000, {0x3c208c16d87cfd47,0x97816a916871ca8d,0xb85045b68181585d,0x30644e72e131a029}};
 FqElement Fq_R2 = {0, 0x80000000, {0xf32cfc5b538afa89,0xb5e71911d44501fb,0x47ab1eff0a417ff6,0x06d89f71cab8351f}};
diff --git a/build/fr.cpp b/build/fr.cpp
index 168d95e..415a824 100644
--- a/build/fr.cpp
+++ b/build/fr.cpp
@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <gmp.h>
-#include <assert.h>
 #include <string>
+#include <stdexcept>
 
 
 static mpz_t q;
@@ -162,7 +162,7 @@ void Fr_div(PFrElement r, PFrElement a, PFrElement b) {
 }
 
 void Fr_fail() {
-    assert(false);
+    throw std::runtime_error("Fr error");
 }
 
 void Fr_longErr()
diff --git a/build/fr_generic.cpp b/build/fr_generic.cpp
index 3d8ee16..6c0d874 100755
--- a/build/fr_generic.cpp
+++ b/build/fr_generic.cpp
@@ -1,7 +1,6 @@
 #include "fr.hpp"
 #include <cstdint>
 #include <cstring>
-#include <cassert>
 
 FrElement Fr_q  = {0, 0x80000000, {0x43e1f593f0000001,0x2833e84879b97091,0xb85045b68181585d,0x30644e72e131a029}};
 FrElement Fr_R2 = {0, 0x80000000, {0x1bb8e645ae216da7,0x53fe3ab1e35c59e3,0x8c49833d53bb8085,0x0216d0b17f4e44a5}};