diff --git a/src/icartt/dataset.py b/src/icartt/dataset.py
index 418073d89daaebe0e5dd096a9e12a944b4155719..a0224da00a4247becba0ebedcb45ab317252fd3b 100644
--- a/src/icartt/dataset.py
+++ b/src/icartt/dataset.py
@@ -476,15 +476,10 @@ class Dataset:
 
         nHeaderSuggested = int(dmp[0])
 
-        # TODO: refactor following try/except statement
         try:
             self.format = Formats(int(dmp[1]))
-        except:
-            raise ValueError(f"ICARTT format {int(dmp[1])} not implemented")
-            # TODO except clause could be re-written like
-            # except ValueError as ve:
-            #     raise ValueError(f"ICARTT format {dmp[1]:d} not implemented") from ve
-            # to show the error trace
+        except ValueError as ve:
+            raise NotImplementedError(f"ICARTT format {dmp[1]} not implemented") from ve
 
         if len(dmp) > 2:
             self.version = dmp[2]