diff --git a/src/icartt/dataset.py b/src/icartt/dataset.py
index 7dbaeaf3275040e67ea9b80f7cacd04be7551d2d..f9c4417acf679e7df652a868b957000014179881 100644
--- a/src/icartt/dataset.py
+++ b/src/icartt/dataset.py
@@ -659,25 +659,20 @@ class Dataset:
 
     def readData(self, splitChar=","):
         """Read ICARTT data (from file)"""
-        if self.inputFhandle.closed:
-            self.inputFhandle = open(self.inputFhandle.name, encoding='utf-8')
-
-        # TODO: refactor following try/except statement
-        try:
-            nul = [self.inputFhandle.readline() for i in range(self.nHeaderFile)]
+        if self.inputFhandle:
+            if self.inputFhandle.closed:
+                self.inputFhandle = open(self.inputFhandle.name, encoding='utf-8')
 
+            _ = [self.inputFhandle.readline() for i in range(self.nHeaderFile)]
             raw = [line.split(splitChar) for line in self.inputFhandle]
+            _ = self.data.addBulkFromTxt(raw)
 
-            nul = self.data.addBulkFromTxt(raw)
-        except:
-            pass
-        finally:
             self.inputFhandle.close()
 
     def read(self, splitChar=","):
         """Read ICARTT data and header"""
         self.readHeader(splitChar)
-        self.endDefineMode(splitChar) # TODO: endDefineMode does not take arg splitChar
+        self.endDefineMode()
         self.readData(splitChar)
 
     def makeFileName(self, dateFormat="%Y%m%d"):