diff --git a/src/compute-disc-error.cc b/src/compute-disc-error.cc
index b0cf6c03465b78951646cad3e8689c561a8c917d..5d4256c97113336b92b5a63fffa2334ef1a42a9a 100644
--- a/src/compute-disc-error.cc
+++ b/src/compute-disc-error.cc
@@ -452,6 +452,7 @@ void measureEOC(const std::shared_ptr<GridType> grid,
       default:
         DUNE_THROW(NotImplemented, "Order '" << order << "' is not implemented");
     }
+    return;  // Success
   }
 
   if (parameterSet.get<std::string>("discretizationErrorMode")=="analytical")
@@ -473,7 +474,10 @@ void measureEOC(const std::shared_ptr<GridType> grid,
       default:
         DUNE_THROW(NotImplemented, "Order '" << order << "' is not implemented");
     }
+    return;  // Success
   }
+
+  DUNE_THROW(NotImplemented, "Unknown discretization error mode encountered!");
 }
 
 int main (int argc, char *argv[]) try