diff --git a/bin/analyzegrid/test_2d_structured.ini b/bin/analyzegrid/test_2d_structured.ini
index 29eca446fad639e675dabcd817c37707b42ebbea..327827a8d79439a4f6988e1fe0bedda658a1be5c 100644
--- a/bin/analyzegrid/test_2d_structured.ini
+++ b/bin/analyzegrid/test_2d_structured.ini
@@ -1,5 +1,3 @@
-__exec_suffix = deg2_symdiff_nonquadvec_nongradvec
-__name = /home/rene/phd/dune-les/build-optimized-clang60-python3/dune-perftool/test/sumfact/poisson/sumfact_poisson_dg_2d_deg2_symdiff_nonquadvec_nongradvec
 cells = 16 16
 deg_suffix = deg2
 diff_suffix = symdiff
diff --git a/bin/analyzegrid/test_2d_unstructured.ini b/bin/analyzegrid/test_2d_unstructured.ini
index 7e9d460da5d86d03eaa2a7b5aeffd70cbdc2f093..c8f4c25aabe980939b9740877a7af4cc0797dbdb 100644
--- a/bin/analyzegrid/test_2d_unstructured.ini
+++ b/bin/analyzegrid/test_2d_unstructured.ini
@@ -1,5 +1,3 @@
-__exec_suffix = deg2_symdiff_nonquadvec_nongradvec
-__name = /home/rene/phd/dune-les/build-optimized-clang60-python3/dune-perftool/test/sumfact/poisson/sumfact_poisson_dg_2d_unstructured_deg2_symdiff_nonquadvec_nongradvec
 deg_suffix = deg2
 diff_suffix = symdiff
 elementType = quadrilateral
diff --git a/bin/analyzegrid/test_3d_structured.ini b/bin/analyzegrid/test_3d_structured.ini
index 575f8877583e99d524fbae5d196b3e7ad77f7fb0..83fc69b5d0ba1b39dec597c719ea5564d9352eee 100644
--- a/bin/analyzegrid/test_3d_structured.ini
+++ b/bin/analyzegrid/test_3d_structured.ini
@@ -1,5 +1,3 @@
-__exec_suffix = deg2_symdiff_nonquadvec_nongradvec
-__name = /home/rene/phd/dune-les/build-optimized-clang60-python3/dune-perftool/test/sumfact/poisson/sumfact_poisson_dg_3d_deg2_symdiff_nonquadvec_nongradvec
 cells = 8 8 8
 deg_suffix = deg2
 diff_suffix = symdiff
diff --git a/bin/analyzegrid/test_3d_unstructured.ini b/bin/analyzegrid/test_3d_unstructured.ini
index 900efe5436bdd01cfc991155a98b305975d09f5b..9f4e53b240eb5475a2368ef241df1348f3031540 100644
--- a/bin/analyzegrid/test_3d_unstructured.ini
+++ b/bin/analyzegrid/test_3d_unstructured.ini
@@ -1,5 +1,3 @@
-__exec_suffix = deg2_symdiff_nonquadvec_nongradvec
-__name = /home/rene/phd/dune-les/build-optimized-clang60-python3/dune-perftool/test/sumfact/poisson/sumfact_poisson_dg_3d_unstructured_deg2_symdiff_nonquadvec_nongradvec
 deg_suffix = deg2
 diff_suffix = symdiff
 elementType = quadrilateral
diff --git a/dune/perftool/sumfact/invertgeometry.hh b/dune/perftool/sumfact/invertgeometry.hh
index b24d6e2e35d791bf548aeee625312a6e7c9f20fe..a20708e8a2c305a35d642124b3c01a2ad0d387f6 100644
--- a/dune/perftool/sumfact/invertgeometry.hh
+++ b/dune/perftool/sumfact/invertgeometry.hh
@@ -5,7 +5,7 @@
 template<typename T>
 inline T invert_and_return_determinant(const T a00, const T a10, const T a01, const T a11, T inverse[4]){
   T det = a00 * a11 - a10 * a01;
-  assert (det != 0.0);
+  assert (std::abs(det) > 1e-12);
 
   inverse[0] = a11 / det;
   inverse[1] = -a10 / det;
@@ -35,7 +35,7 @@ inline T invert_and_return_determinant(const T a00, const T a10, const T a20,
   det += t12 * a12;
   det -= t14 * a11;
 
-  assert (det != 0.0);
+  assert (std::abs(det) > 1e-12);
 
   T t17 = 1.0/det;
 
diff --git a/python/dune/perftool/sumfact/switch.py b/python/dune/perftool/sumfact/switch.py
index 1528d2c91999ebfd138e540f63fdae314087b293..0aeef4f352e3fa8f8da50984ddc899ed677f4bb1 100644
--- a/python/dune/perftool/sumfact/switch.py
+++ b/python/dune/perftool/sumfact/switch.py
@@ -62,7 +62,11 @@ def decide_if_kernel_is_necessary(facedir_s, facemod_s, facedir_n, facemod_n):
             with open(filename) as csv_file:
                 csv_reader = csv.reader(csv_file, delimiter=" ")
                 for row in csv_reader:
-                    if (facedir_s == int(row[1])) and (facemod_s == int(row[2])) and (facedir_n == int(row[3])) and (facemod_n == int(row[4])):
+                    if (row[0] == 'skeleton' and
+                            facedir_s == int(row[1])) and \
+                            (facemod_s == int(row[2])) and \
+                            (facedir_n == int(row[3])) and \
+                            (facemod_n == int(row[4])):
                         return True
                 return False
         else:
@@ -110,7 +114,7 @@ def generate_exterior_facet_switch():
                                                                               ),
                                                               args))
 
-    block.append("    default: assert(false);")
+    block.append("    default: throw(std::exception());")
     block.append("  }")
     block.append("}")
 
@@ -143,7 +147,7 @@ def generate_interior_facet_switch():
                                                                                           ),
                                                                           args))
 
-    block.append("    default: assert(false);")
+    block.append("    default: throw(std::exception());")
     block.append("  }")
     block.append("}")