diff --git a/corsika/stack/NuclearStackExtension.hpp b/corsika/stack/NuclearStackExtension.hpp
index 1139d440bc93d3e5a8370f445d4c71c2efe03c60..0f14c68e970a44e4e6ef8667f7992f3440d25cd5 100644
--- a/corsika/stack/NuclearStackExtension.hpp
+++ b/corsika/stack/NuclearStackExtension.hpp
@@ -146,12 +146,12 @@ namespace corsika::nuclear_stack {
      * Overwrite normal setMomentum function with nuclear version
      */
     void setMomentum(MomentumVector const& v);
-    
+
     /**
      * Overwrite normal getMomentum function with nuclear version
      */
     MomentumVector getMomentum() const;
-    
+
     /**
      * Overwrite normal getEnergy function with nuclear version
      */
diff --git a/corsika/stack/VectorStack.hpp b/corsika/stack/VectorStack.hpp
index 0c20a2361bf5900ed078dc161543bbd5d99113fb..47b503c8f57f6d54a6e00b9eb9ced081ada2cc7b 100644
--- a/corsika/stack/VectorStack.hpp
+++ b/corsika/stack/VectorStack.hpp
@@ -87,7 +87,8 @@ namespace corsika {
 
     ///! Set energy
     void setEnergy(HEPEnergyType const& e) {
-      super_type::getStackData().setKineticEnergy(super_type::getIndex(), e - this->getMass());
+      super_type::getStackData().setKineticEnergy(super_type::getIndex(),
+                                                  e - this->getMass());
     }
 
     ///! Set kinetic energy
@@ -107,7 +108,8 @@ namespace corsika {
             super_type::getIndex(), DirectionVector(v.getCoordinateSystem(), {0, 0, 0}));
       } else {
         super_type::getStackData().setKineticEnergy(
-            super_type::getIndex(), sqrt(square(getMass()) + square(P)) - this->getMass());
+            super_type::getIndex(),
+            sqrt(square(getMass()) + square(P)) - this->getMass());
         super_type::getStackData().setDirection(super_type::getIndex(), v / P);
       }
     }
diff --git a/tests/framework/testSecondaryView.cpp b/tests/framework/testSecondaryView.cpp
index fa113f88b6e111e9837d9ef96d28a432024974dd..9ca07a13d1e567398456207874cbd47093902956 100644
--- a/tests/framework/testSecondaryView.cpp
+++ b/tests/framework/testSecondaryView.cpp
@@ -76,6 +76,7 @@ TEST_CASE("SecondaryStack", "[stack]") {
     CHECK(view.getSize() == 0);
     CHECK(view.getEntries() == 0);
     CHECK(view.isEmpty());
+    CHECK_THROWS(view.erase(view.begin())); // nothing to delete yet
 
     {
       auto proj = view.getProjectile();
@@ -112,6 +113,7 @@ TEST_CASE("SecondaryStack", "[stack]") {
 
     auto pDel = view.getNextParticle();
     view.erase(pDel);
+    CHECK_THROWS(view.erase(pDel)); // already erased
     CHECK(view.getSize() == 2);
     CHECK(stack.getSize() == 4);
 
diff --git a/tests/framework/testStackInterface.cpp b/tests/framework/testStackInterface.cpp
index 4171647af5a547baeb55e6a2e3c3701eaeb77b29..a8d82894a054adca8442db3962dc1b5691842d96 100644
--- a/tests/framework/testStackInterface.cpp
+++ b/tests/framework/testStackInterface.cpp
@@ -71,6 +71,9 @@ TEST_CASE("Stack", "[Stack]") {
   SECTION("delete from stack") {
 
     StackTest stack;
+
+    CHECK_THROWS(stack.erase(stack.begin())); // nothing to delete
+
     CHECK(stack.getSize() == 0);
     StackTest::stack_iterator_type p =
         stack.addParticle(std::tuple{0.}); // valid way to access particle data
@@ -80,6 +83,7 @@ TEST_CASE("Stack", "[Stack]") {
     stack.erase(p);
     CHECK(stack.getSize() == 1);
     CHECK(stack.getEntries() == 0);
+    CHECK_THROWS(stack.erase(p)); // already deleted
   }
 
   SECTION("delete particle") {